struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [struts-site] branch asf-staging updated: Updates stage by Jenkins
Date Fri, 18 Oct 2019 13:27:41 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-staging by this push:
     new 78ec85d  Updates stage by Jenkins
78ec85d is described below

commit 78ec85d6e7bf77d07afad886686398a127a6043e
Author: jenkins <builds@apache.org>
AuthorDate: Fri Oct 18 13:27:37 2019 +0000

    Updates stage by Jenkins
---
 content/404.html                                   |   3 +-
 content/announce-2002.html                         |   1 -
 content/announce-2003.html                         |   1 -
 content/announce-2004.html                         |   1 -
 content/announce-2005.html                         |   1 -
 content/announce-2006.html                         |   1 -
 content/announce-2007.html                         |   1 -
 content/announce-2008.html                         |   1 -
 content/announce-2009.html                         |   1 -
 content/announce-2010.html                         |   1 -
 content/announce-2011.html                         |   1 -
 content/announce-2012.html                         |   1 -
 content/announce-2013.html                         |   1 -
 content/announce-2014.html                         |  21 +-
 content/announce-2015.html                         |   1 -
 content/announce-2016.html                         |   1 -
 content/announce-2017.html                         |   3 +-
 content/announce-2018.html                         |   6 +-
 content/announce.html                              |   1 -
 content/birdseye.html                              |   1 -
 content/builds.html                                |  26 +-
 content/bylaws.html                                |  17 +-
 content/coding-standards.html                      |  28 +--
 ...essing-application-session-request-objects.html |  11 +-
 content/core-developers/action-chaining.html       |   6 +-
 content/core-developers/action-configuration.html  | 109 ++++----
 content/core-developers/action-event-listener.html |  15 +-
 content/core-developers/action-mapper.html         |  83 +++---
 .../action-proxy-and-actionproxy-factory.html      |  26 +-
 content/core-developers/after-annotation.html      |  10 +-
 .../ajax-client-side-validation.html               |  87 +++----
 content/core-developers/ajax.html                  |  20 +-
 content/core-developers/alias-interceptor.html     |   6 +-
 .../annotation-parameter-filter-interceptor.html   |   6 +-
 .../annotation-workflow-interceptor.html           |  26 +-
 content/core-developers/annotations.html           |   1 -
 content/core-developers/application-servers.html   |   1 -
 content/core-developers/basic-validation.html      |  33 ++-
 content/core-developers/bean-configuration.html    |   6 +-
 content/core-developers/before-annotation.html     |  10 +-
 .../core-developers/before-result-annotation.html  |  10 +-
 content/core-developers/big-picture.html           |   1 -
 content/core-developers/chain-result.html          |   6 +-
 content/core-developers/chaining-interceptor.html  |  26 +-
 content/core-developers/checkbox-interceptor.html  |   1 -
 .../core-developers/clear-session-interceptor.html |   6 +-
 .../core-developers/client-side-validation.html    |   1 -
 content/core-developers/client-validation.html     |  28 +--
 .../conditionalvisitor-validator.html              |   6 +-
 .../core-developers/configuration-elements.html    |  11 +-
 content/core-developers/configuration-files.html   |   1 -
 .../configuration-provider-and-configuration.html  |   8 +-
 .../core-developers/constant-configuration.html    |  21 +-
 content/core-developers/conversion-annotation.html |  10 +-
 ...onversion-error-field-validator-annotation.html |   6 +-
 .../conversion-error-interceptor.html              |   8 +-
 content/core-developers/conversion-validator.html  |  26 +-
 content/core-developers/cookie-interceptor.html    |   6 +-
 .../cookie-provider-interceptor.html               |   6 +-
 .../core-developers/create-if-null-annotation.html |   6 +-
 .../create-session-interceptor.html                |   6 +-
 .../custom-validator-annotation.html               |   6 +-
 .../date-range-field-validator-annotation.html     |   6 +-
 content/core-developers/date-validator.html        |   6 +-
 content/core-developers/debugging-interceptor.html |   1 -
 content/core-developers/debugging.html             |  11 +-
 content/core-developers/default-properties.html    |   1 -
 .../default-workflow-interceptor.html              |  28 ++-
 content/core-developers/dependency-injection.html  |   1 -
 content/core-developers/development-mode.html      |   6 +-
 content/core-developers/dispatcher-listener.html   |  10 +-
 content/core-developers/dispatcher-result.html     |  12 +-
 content/core-developers/dispatcher.html            |   1 -
 .../double-range-field-validator-annotation.html   |   6 +-
 content/core-developers/double-validator.html      |   6 +-
 content/core-developers/element-annotation.html    |   6 +-
 .../email-validator-annotation.html                |   6 +-
 content/core-developers/email-validator.html       |  11 +-
 .../core-developers/exception-configuration.html   |  11 +-
 content/core-developers/exception-interceptor.html |   6 +-
 .../execute-and-wait-interceptor.html              |   6 +-
 .../expression-validator-annotation.html           |   6 +-
 content/core-developers/expression-validator.html  |   6 +-
 .../field-expression-validator-annotation.html     |   6 +-
 .../core-developers/fieldexpression-validator.html |   6 +-
 .../core-developers/file-upload-interceptor.html   |  29 +--
 content/core-developers/file-upload.html           | 112 ++++-----
 .../formatting-dates-and-numbers.html              |  16 +-
 content/core-developers/freemarker-result.html     |   6 +-
 content/core-developers/freemarker-support.html    |  26 +-
 content/core-developers/glassfish-2-x.html         |   6 +-
 content/core-developers/httpheader-result.html     |   6 +-
 content/core-developers/https-and-ie-issues.html   |  10 +-
 content/core-developers/i18n-interceptor.html      |   6 +-
 content/core-developers/include-configuration.html |   6 +-
 content/core-developers/index.html                 |   1 -
 .../core-developers/input-config-annotation.html   |  12 +-
 .../int-range-field-validator-annotation.html      |   6 +-
 content/core-developers/int-validator.html         |   6 +-
 .../core-developers/interceptor-configuration.html |  11 +-
 content/core-developers/interceptors.html          | 123 +++++----
 content/core-developers/jboss-5.html               |  11 +-
 content/core-developers/key-annotation.html        |   6 +-
 .../core-developers/key-property-annotation.html   |   6 +-
 content/core-developers/localization.html          |  36 ++-
 content/core-developers/logging-interceptor.html   |   6 +-
 content/core-developers/logging.html               |  47 ++--
 .../core-developers/message-store-interceptor.html |  17 +-
 .../core-developers/model-driven-interceptor.html  |  11 +-
 content/core-developers/model-driven.html          |  33 ++-
 .../core-developers/multiselect-interceptor.html   |   1 -
 content/core-developers/namespace-annotation.html  |   1 -
 .../core-developers/namespace-configuration.html   |   6 +-
 content/core-developers/no-op-interceptor.html     |   1 -
 content/core-developers/nutshell.html              |  18 +-
 content/core-developers/object-factory.html        |  11 +-
 content/core-developers/package-configuration.html |  17 +-
 .../parameter-filter-interceptor.html              |   5 +-
 .../parameter-remover-interceptor.html             |   6 +-
 .../core-developers/parameters-interceptor.html    |  21 +-
 content/core-developers/performance-tuning.html    |   6 +-
 content/core-developers/plaintext-result.html      |   6 +-
 content/core-developers/postback-result.html       |   6 +-
 content/core-developers/pre-result-listener.html   |  19 +-
 content/core-developers/prepare-interceptor.html   |  18 +-
 .../pure-java-script-client-side-validation.html   |   1 -
 .../core-developers/redirect-action-result.html    |  11 +-
 content/core-developers/redirect-result.html       |  13 +-
 .../regex-field-validator-annotation.html          |   6 +-
 content/core-developers/regex-validator.html       |   6 +-
 .../core-developers/reloading-configuration.html   |   6 +-
 .../required-field-validator-annotation.html       |   6 +-
 .../required-string-validator-annotation.html      |   6 +-
 content/core-developers/required-validator.html    |   6 +-
 .../core-developers/requiredstring-validator.html  |   6 +-
 content/core-developers/restful-action-mapper.html |  57 ++---
 content/core-developers/result-configuration.html  |  63 ++---
 content/core-developers/result-types.html          |  18 +-
 content/core-developers/roles-interceptor.html     |  11 +-
 content/core-developers/scope-interceptor.html     |  11 +-
 .../scoped-model-driven-interceptor.html           |   6 +-
 .../servlet-config-interceptor.html                |   6 +-
 content/core-developers/short-validator.html       |   6 +-
 content/core-developers/static-content.html        |  16 +-
 .../static-parameters-interceptor.html             |   6 +-
 content/core-developers/stream-result.html         |  19 +-
 .../string-length-field-validator-annotation.html  |   6 +-
 .../core-developers/stringlength-validator.html    |   6 +-
 content/core-developers/struts-default-vm.html     |   6 +-
 content/core-developers/struts-default-xml.html    |  43 ++--
 content/core-developers/struts-xml.html            |   1 -
 content/core-developers/sunone-7-0.html            |  11 +-
 content/core-developers/timer-interceptor.html     |   6 +-
 content/core-developers/token-interceptor.html     |   6 +-
 .../core-developers/token-session-interceptor.html |   6 +-
 .../type-conversion-annotation.html                |  16 +-
 content/core-developers/type-conversion.html       | 114 ++++-----
 content/core-developers/unknown-handlers.html      |  11 +-
 .../core-developers/url-validator-annotation.html  |  16 +-
 content/core-developers/url-validator.html         |   6 +-
 .../core-developers/using-field-validators.html    |  52 ++--
 .../using-non-field-validators.html                |  28 +--
 .../using-visitor-field-validator.html             |  20 +-
 content/core-developers/validation-annotation.html |  30 +--
 .../core-developers/validation-interceptor.html    |   6 +-
 .../validation-parameter-annotation.html           |   6 +-
 content/core-developers/validation.html            | 101 ++++----
 .../core-developers/validations-annotation.html    |  18 +-
 content/core-developers/velocity-properties.html   |   6 +-
 content/core-developers/velocity-result.html       |   6 +-
 .../visitor-field-validator-annotation.html        |   6 +-
 content/core-developers/visitor-validator.html     |   6 +-
 content/core-developers/web-xml.html               |  41 ++-
 content/core-developers/weblogic-6-1.html          |   1 -
 content/core-developers/weblogic.html              |  21 +-
 content/core-developers/websphere.html             |  31 +--
 content/core-developers/wildcard-mappings.html     |  75 +++---
 content/core-developers/writing-interceptors.html  |  24 +-
 content/core-developers/xsl-result.html            |  31 +--
 content/core-developers/zero-configuration.html    |  16 +-
 content/dev-mail.html                              |   1 -
 content/docs/index.html                            |   1 -
 content/download.html                              |   1 -
 content/getting-started/annotations.html           |  23 +-
 content/getting-started/coding-actions.html        |  30 +--
 content/getting-started/control-tags.html          |  21 +-
 content/getting-started/debugging-struts.html      |   6 +-
 content/getting-started/exception-handling.html    |  21 +-
 content/getting-started/exclude-parameters.html    |  16 +-
 content/getting-started/form-tags.html             |  51 ++--
 .../getting-started/form-validation-using-xml.html |  21 +-
 content/getting-started/form-validation.html       |  16 +-
 .../getting-started/hello-world-using-struts2.html |  24 +-
 .../how-to-create-a-struts2-web-application.html   |  46 ++--
 content/getting-started/http-session.html          |  28 +--
 content/getting-started/index.html                 |   1 -
 .../getting-started/introducing-interceptors.html  |  16 +-
 .../getting-started/jasper-reports-tutorial.html   |  79 +++---
 .../getting-started/message-resource-files.html    |  76 +++---
 content/getting-started/preperable-interface.html  |   6 +-
 content/getting-started/processing-forms.html      |  45 ++--
 content/getting-started/spring.html                |  48 ++--
 content/getting-started/themes.html                |  21 +-
 content/getting-started/unit-testing.html          |  20 +-
 content/getting-started/using-tags.html            |  42 ++--
 .../getting-started/wildcard-method-selection.html |  15 +-
 content/helping.html                               |   6 +-
 content/index.html                                 |   1 -
 content/kickstart.html                             |  17 +-
 content/mail.html                                  |  13 +-
 content/maven-archetypes/index.html                |  86 +++----
 .../maven-archetypes/struts2-archetype-blank.html  |  46 ++--
 content/plugins/bean-validation/index.html         |  57 ++---
 content/plugins/cdi/index.html                     |  78 +++---
 content/plugins/codebehind/index.html              |   1 -
 content/plugins/config-browser/index.html          |   1 -
 content/plugins/convention/converting.html         |  11 +-
 content/plugins/convention/index.html              | 225 +++++++----------
 content/plugins/dwr/index.html                     |   6 +-
 content/plugins/embedded-jsp/index.html            |  16 +-
 content/plugins/index.html                         |   1 -
 content/plugins/jasperreports/index.html           |  11 +-
 content/plugins/java-8-support/index.html          |   6 +-
 content/plugins/javatemplates/index.html           |   6 +-
 content/plugins/jfreechart/index.html              |  21 +-
 content/plugins/jsf/index.html                     |  11 +-
 content/plugins/json/index.html                    | 264 +++++++++----------
 content/plugins/json/json-ajax-validation.html     | 279 ++++++++++-----------
 content/plugins/junit/index.html                   |  33 ++-
 content/plugins/osgi/index.html                    |  78 +++---
 content/plugins/oval/index.html                    |  52 ++--
 content/plugins/plexus/index.html                  |   6 +-
 content/plugins/plugins.html                       |  16 +-
 content/plugins/portlet-tiles/index.html           |  21 +-
 content/plugins/portlet/index.html                 |  21 +-
 .../plugins/portlet/struts-2-portlet-tutorial.html | 136 +++++-----
 content/plugins/rest/index.html                    |  57 ++---
 content/plugins/sitegraph/index.html               |  26 +-
 content/plugins/sitemesh/index.html                |  36 ++-
 content/plugins/spring/index.html                  |  56 ++---
 .../spring-session-components-workarounds.html     |   1 -
 content/plugins/struts-1/index.html                |  16 +-
 content/plugins/testng/index.html                  |  11 +-
 content/plugins/tiles-3/index.html                 |  21 +-
 content/plugins/tiles/index.html                   |  41 ++-
 content/plugins/tiles/tiles-use.html               |  10 +-
 content/primer.html                                |   1 -
 content/release-guidelines.html                    |   9 +-
 content/releases.html                              |   1 -
 content/security.html                              |   3 +-
 content/security/index.html                        |  55 ++--
 content/struts1eol-announcement.html               |   1 -
 content/struts1eol-press.html                      |   1 -
 content/struts23-eol-announcement.html             |   1 -
 content/submitting-patches.html                    |  77 +++---
 content/tag-developers/a-tag.html                  |   6 +-
 .../access-to-valuestack-from-jsps.html            |  22 +-
 content/tag-developers/action-tag.html             |  20 +-
 content/tag-developers/actionerror-tag.html        |   6 +-
 content/tag-developers/actionmessage-tag.html      |   6 +-
 content/tag-developers/ajax-a-template.html        |   1 -
 .../ajax-and-javascript-recipes.html               |  75 +++---
 content/tag-developers/ajax-common-header.html     | 127 +++++-----
 content/tag-developers/ajax-div-template.html      |  51 ++--
 content/tag-developers/ajax-event-system.html      |  11 +-
 content/tag-developers/ajax-head-template.html     |  81 +++---
 content/tag-developers/ajax-tags.html              |   1 -
 content/tag-developers/ajax-theme.html             |   1 -
 content/tag-developers/alt-syntax.html             |   1 -
 content/tag-developers/append-tag.html             |  19 +-
 content/tag-developers/bean-tag.html               |   6 +-
 .../cewolf-charts-using-velocity-templates.html    |  22 +-
 content/tag-developers/checkbox-tag.html           |   6 +-
 content/tag-developers/checkboxlist-tag.html       |   6 +-
 content/tag-developers/combobox-tag.html           |  11 +-
 content/tag-developers/component-tag.html          |  31 +--
 content/tag-developers/css-xhtml-theme.html        |  17 +-
 content/tag-developers/date-tag.html               |   6 +-
 content/tag-developers/datetextfield-tag.html      |   6 +-
 content/tag-developers/debug-tag.html              |   1 -
 content/tag-developers/dojo-a-tag.html             |  31 +--
 content/tag-developers/dojo-autocompleter-tag.html |  17 +-
 content/tag-developers/dojo-bind-tag.html          |  31 +--
 .../tag-developers/dojo-datetimepicker-tag.html    |   9 +-
 content/tag-developers/dojo-div-tag.html           |  16 +-
 content/tag-developers/dojo-head-tag.html          |  11 +-
 content/tag-developers/dojo-submit-tag.html        |  46 ++--
 content/tag-developers/dojo-tabbedpanel-tag.html   |  11 +-
 content/tag-developers/dojo-textarea-tag.html      |   1 -
 content/tag-developers/dojo-tree-tag.html          |  16 +-
 content/tag-developers/dojo-treenode-tag.html      |   6 +-
 content/tag-developers/doubleselect-tag.html       |   6 +-
 content/tag-developers/else-tag.html               |   6 +-
 content/tag-developers/elseif-tag.html             |   6 +-
 content/tag-developers/extending-themes.html       |   6 +-
 content/tag-developers/fielderror-tag.html         |   6 +-
 content/tag-developers/file-tag.html               |   6 +-
 content/tag-developers/form-tag.html               |   6 +-
 content/tag-developers/form-tags.html              |   9 +-
 content/tag-developers/freemarker-tags.html        |  18 +-
 content/tag-developers/freemarker.html             |  31 +--
 content/tag-developers/generator-tag.html          |   6 +-
 content/tag-developers/generic-tags.html           |   1 -
 content/tag-developers/head-tag.html               |   6 +-
 content/tag-developers/hidden-tag.html             |   6 +-
 content/tag-developers/i18n-tag.html               |   6 +-
 content/tag-developers/if-tag.html                 |   6 +-
 content/tag-developers/include-tag.html            |   6 +-
 content/tag-developers/index.html                  |   1 -
 .../tag-developers/inputtransferselect-tag.html    |  11 +-
 content/tag-developers/iterator-tag.html           |  36 ++-
 content/tag-developers/jsp-tags.html               |   1 -
 content/tag-developers/jsp.html                    |   6 +-
 content/tag-developers/label-tag.html              |   6 +-
 content/tag-developers/merge-tag.html              |  19 +-
 content/tag-developers/ognl-basics.html            |  26 +-
 .../ognl-expression-compilation.html               | 102 ++++----
 content/tag-developers/ognl.html                   |  30 +--
 content/tag-developers/optgroup-tag.html           |   6 +-
 .../tag-developers/optiontransferselect-tag.html   |   6 +-
 content/tag-developers/param-tag.html              |   8 +-
 content/tag-developers/password-tag.html           |   6 +-
 content/tag-developers/property-tag.html           |   6 +-
 content/tag-developers/push-tag.html               |  21 +-
 content/tag-developers/radio-tag.html              |   6 +-
 content/tag-developers/reset-tag.html              |  11 +-
 content/tag-developers/select-tag.html             |   6 +-
 .../selecting-template-directory.html              |   1 -
 content/tag-developers/selecting-themes.html       |   1 -
 content/tag-developers/set-tag.html                |   6 +-
 content/tag-developers/simple-theme.html           |   1 -
 content/tag-developers/sort-tag.html               |   6 +-
 content/tag-developers/struts-tags.html            |   1 -
 content/tag-developers/submit-tag.html             |   1 -
 content/tag-developers/subset-tag.html             |  43 ++--
 content/tag-developers/tag-reference.html          |   1 -
 content/tag-developers/tag-syntax.html             |   8 +-
 content/tag-developers/template-loading.html       |   1 -
 content/tag-developers/text-tag.html               |  26 +-
 content/tag-developers/textarea-tag.html           |   6 +-
 content/tag-developers/textfield-tag.html          |   6 +-
 content/tag-developers/themes-and-templates.html   |   1 -
 content/tag-developers/token-tag.html              |   6 +-
 content/tag-developers/ui-tags.html                |   1 -
 content/tag-developers/updownselect-tag.html       |   6 +-
 content/tag-developers/url-tag.html                |  11 +-
 content/tag-developers/velocity-tags.html          |   6 +-
 content/tag-developers/velocity.html               |  16 +-
 content/tag-developers/xhtml-theme.html            |   1 -
 content/volunteers.html                            |   1 -
 content/youatstruts.html                           |   1 -
 351 files changed, 2721 insertions(+), 3957 deletions(-)

diff --git a/content/404.html b/content/404.html
index 4cb8689..c97415a 100644
--- a/content/404.html
+++ b/content/404.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -128,7 +127,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/404.md" title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <h1 id="page-not-found">404 Page Not Found</h1>
+    <h1 id="404-page-not-found">404 Page Not Found</h1>
 
 <p>The page was moved or never existed.<br />
 Use menu above to navigate or go to <a href="/">home page</a>.<br />
diff --git a/content/announce-2002.html b/content/announce-2002.html
index 496061d..47586f0 100644
--- a/content/announce-2002.html
+++ b/content/announce-2002.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2003.html b/content/announce-2003.html
index 02492f6..32d698b 100644
--- a/content/announce-2003.html
+++ b/content/announce-2003.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2004.html b/content/announce-2004.html
index a9c269a..8048fc4 100644
--- a/content/announce-2004.html
+++ b/content/announce-2004.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2005.html b/content/announce-2005.html
index 457e7c3..05d6376 100644
--- a/content/announce-2005.html
+++ b/content/announce-2005.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2006.html b/content/announce-2006.html
index 25ff4ee..a174b1a 100644
--- a/content/announce-2006.html
+++ b/content/announce-2006.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2007.html b/content/announce-2007.html
index f47e924..53220ee 100644
--- a/content/announce-2007.html
+++ b/content/announce-2007.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2008.html b/content/announce-2008.html
index 0abd85b..241778a 100644
--- a/content/announce-2008.html
+++ b/content/announce-2008.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2009.html b/content/announce-2009.html
index 8c3972c..8c0216f 100644
--- a/content/announce-2009.html
+++ b/content/announce-2009.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2010.html b/content/announce-2010.html
index b3ed922..56f8921 100644
--- a/content/announce-2010.html
+++ b/content/announce-2010.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2011.html b/content/announce-2011.html
index 916e11b..27230e8 100644
--- a/content/announce-2011.html
+++ b/content/announce-2011.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2012.html b/content/announce-2012.html
index 2cb3538..4201303 100644
--- a/content/announce-2012.html
+++ b/content/announce-2012.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2013.html b/content/announce-2013.html
index 936b509..3e8a206 100644
--- a/content/announce-2013.html
+++ b/content/announce-2013.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2014.html b/content/announce-2014.html
index 06378a7..52c0354 100644
--- a/content/announce-2014.html
+++ b/content/announce-2014.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -238,26 +237,24 @@ the correction wasn’t sufficient.</p>
 <p>In your struts.xml, replace all custom references to params-interceptor with the following code, especially regarding the class-pattern
 found at the beginning of the excludeParams list:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;interceptor-ref name="params"&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&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;
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>If you are using default interceptor stacks packaged in struts-default.xml, change your parent packages to a customized secured configuration
 as in the following example. Given you are using defaultStack so far, change your packages from</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;package name="default" namespace="/" extends="struts-default"&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;package name="default" namespace="/" extends="struts-default"&gt;
     &lt;default-interceptor-ref name="defaultStack" /&gt;
     ...
     ...
 &lt;/package&gt;
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>to</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;package name="default" namespace="/" extends="struts-default"&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;package name="default" namespace="/" extends="struts-default"&gt;
     &lt;interceptors&gt;
         &lt;interceptor-stack name="secureDefaultStack"&gt;
             &lt;interceptor-ref name="defaultStack"&gt;
@@ -269,8 +266,7 @@ as in the following example. Given you are using defaultStack so far, change you
     &lt;default-interceptor-ref name="secureDefaultStack" /&gt;
     ...
 &lt;/package&gt; 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Please follow the Apache Struts Announcements to stay updated regarding the upcoming security release. Most likely the release will be available within the next 72 hours.
 Please prepare for upgrading all Struts 2 based production systems to the new release version once available.</p>
@@ -311,13 +307,12 @@ the commons-fileupload jar file in WEB-INF/lib with the fixed jar. For
 Maven based Struts 2 projects, the following dependency needs to be
 added:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;dependency&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&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;
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>More details can be found here:</p>
 
diff --git a/content/announce-2015.html b/content/announce-2015.html
index eb06f36..6ec71a2 100644
--- a/content/announce-2015.html
+++ b/content/announce-2015.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2016.html b/content/announce-2016.html
index a4cc388..3a24b7b 100644
--- a/content/announce-2016.html
+++ b/content/announce-2016.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/announce-2017.html b/content/announce-2017.html
index 6c32df4..3145267 100644
--- a/content/announce-2017.html
+++ b/content/announce-2017.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -354,7 +353,7 @@ to the user list, and, if appropriate, file a tracking ticket.</p>
 can be present in your application. Please re-read the mentioned bulletin and apply required
 actions if needed.</p>
 
-<p>Please report any problems back to the <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#115;&#101;&#099;&#117;&#114;&#105;&#116;&#121;&#064;&#115;&#116;&#114;&#117;&#116;&#115;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">Struts Security</a> mailing list.</p>
+<p>Please report any problems back to the <a href="mailto:security@struts.apache.org">Struts Security</a> mailing list.</p>
 
 <h4 id="a20170707">07 July 2017 - Struts 2.3.33 General Availability</h4>
 
diff --git a/content/announce-2018.html b/content/announce-2018.html
index d9996ea..1c63610 100644
--- a/content/announce-2018.html
+++ b/content/announce-2018.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -318,13 +317,12 @@ the commons-fileupload jar file in WEB-INF/lib with the fixed jar. For
 Maven based Struts 2 projects, the following dependency needs to be
 added:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;groupId&gt;</span>commons-fileupload<span class="nt">&lt;/groupId&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>commons-fileupload<span class="nt">&lt;/artifactId&gt;</span>
   <span class="nt">&lt;version&gt;</span>1.3.3<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>More details can be found here:</p>
 
diff --git a/content/announce.html b/content/announce.html
index 099f0cc..ef4009e 100644
--- a/content/announce.html
+++ b/content/announce.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/birdseye.html b/content/birdseye.html
index 81ffba8..a32dbe0 100644
--- a/content/birdseye.html
+++ b/content/birdseye.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/builds.html b/content/builds.html
index 917717d..7503750 100644
--- a/content/builds.html
+++ b/content/builds.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -153,15 +152,13 @@ your own copy of the product, use the source code provided with an approved rele
 
 <p>With the <a href="http://git-scm.com/">Git client</a> installed, obtaining a working copy of the Struts codebase is as simple as</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&gt; git clone https://gitbox.apache.org/repos/asf/struts.git
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&gt; git clone https://gitbox.apache.org/repos/asf/struts.git
+</code></pre></div></div>
 
 <p>or from GitHub</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&gt; git clone https://github.com/apache/struts.git
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&gt; git clone https://github.com/apache/struts.git
+</code></pre></div></div>
 
 <p>For more about using version control systems at Apache, see the ASF’s
 <a href="http://www.apache.org/dev/#version-control">Source Code Repositories</a> page.</p>
@@ -175,15 +172,13 @@ your own applications!)</p>
 
 <p>With Maven installed, building a Struts codebase is as simple as</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&gt; mvn install
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&gt; mvn install
+</code></pre></div></div>
 
 <p>or</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&gt; mvn -DskipAssembly=true install
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&gt; mvn -DskipAssembly=true install
+</code></pre></div></div>
 
 <p>Maven will automatically download any dependencies as needed.</p>
 
@@ -225,15 +220,14 @@ of the distribution may be upgraded to “Beta” or “General Availability”,
 and then made available through ibiblio and other public Maven repositories. To obtain an early distribution via Maven,
 specify the ASF Snapshot repository in the project’s POM.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;repositories&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;repositories&gt;</span>
     <span class="nt">&lt;repository&gt;</span>
         <span class="nt">&lt;id&gt;</span>apache.snapshots<span class="nt">&lt;/id&gt;</span>
         <span class="nt">&lt;name&gt;</span>ASF Maven 2 Snapshot<span class="nt">&lt;/name&gt;</span>
         <span class="nt">&lt;url&gt;</span>https://repository.apache.org/content/groups/snapshots/<span class="nt">&lt;/url&gt;</span>
     <span class="nt">&lt;/repository&gt;</span>
 <span class="nt">&lt;/repositories&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="licensing-of-apache-struts-builds">Licensing of Apache Struts Builds</h2>
 
diff --git a/content/bylaws.html b/content/bylaws.html
index cfde3ab..423700f 100644
--- a/content/bylaws.html
+++ b/content/bylaws.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -294,13 +293,15 @@ to circulate for 72 hours before taking action.</p>
 
 <h2 id="action-items">Action Items</h2>
 
-<p>All decisions revolve around “<em>Action Items</em>”. Action Items consist of the following:
-- Long Term Plans
-- Short Term Plans
-- Product Changes
-- Showstoppers (or “blockers”)
-- Release Plan
-- Release Grade</p>
+<p>All decisions revolve around “<em>Action Items</em>”. Action Items consist of the following:</p>
+<ul>
+  <li>Long Term Plans</li>
+  <li>Short Term Plans</li>
+  <li>Product Changes</li>
+  <li>Showstoppers (or “blockers”)</li>
+  <li>Release Plan</li>
+  <li>Release Grade</li>
+</ul>
 
 <h3 id="long-term-plans">Long Term Plans</h3>
 
diff --git a/content/coding-standards.html b/content/coding-standards.html
index 130723b..ff6909f 100644
--- a/content/coding-standards.html
+++ b/content/coding-standards.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -160,7 +159,7 @@ new feature implementation with code reformatting. Thus only confuses people rev
 <p>If something isn’t clear, you have doubts and anything else - ask! Maybe during materialising your thoughts as text
 you will gain the answer - Rubber Duck effect :-) Anyway, instead spending time on looking for solution - ask.</p>
 
-<p>The best place to ask question is Struts Developers List <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#064;&#115;&#116;&#114;&#117;&#116;&#115;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">&#100;&#101;&#118;&#064;&#115;&#116;&#114;&#117;&#116;&#115;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;</a></p>
+<p>The best place to ask question is Struts Developers List <a href="mailto:dev@struts.apache.org">dev@struts.apache.org</a></p>
 
 <h2 id="wip">WIP</h2>
 
@@ -175,7 +174,7 @@ or improving.</p>
 
 <p>The original source code:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>// Hidden input section
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>// Hidden input section
 a = new Attributes();
 a.add("type", "hidden")
     .add("id", "__multiselect_" + StringUtils.defaultString(StringEscapeUtils.escapeHtml4(id)))
@@ -183,12 +182,11 @@ a.add("type", "hidden")
     .add("value", "").addIfTrue("disabled", disabled);
 start("input", a);
 end("input");
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>After applying default reformatting (80 columns margin):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>// Hidden input section
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>// Hidden input section
 a = new Attributes();
 a.add("type", "hidden")
     .add("id",
@@ -204,8 +202,7 @@ a.add("type", "hidden")
     .add("value", "").addIfTrue("disabled", disabled);
 start("input", a);
 end("input");
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Some suggestions how to improve the code:</p>
 
@@ -213,26 +210,23 @@ end("input");
   <li>
     <p>use static imports</p>
 
-    <div class="highlighter-rouge"><pre class="highlight"><code>  a.add("type", "hidden")
+    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  a.add("type", "hidden")
    .add("id", "__multiselect_" + defaultString(escapeHtml4(id)));
-</code></pre>
-    </div>
+</code></pre></div>    </div>
   </li>
   <li>
     <p>use dedicated method</p>
 
-    <div class="highlighter-rouge"><pre class="highlight"><code>  a.add("type", "hidden")
+    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  a.add("type", "hidden")
    .add("id", "__multiselect_" + safeId(id));
-</code></pre>
-    </div>
+</code></pre></div>    </div>
   </li>
   <li>
     <p>use builder</p>
 
-    <div class="highlighter-rouge"><pre class="highlight"><code>  a.add("type", "hidden")
+    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  a.add("type", "hidden")
    .add("id", HtmlID.with("__multiselect_").withSafeId(id).create());
-</code></pre>
-    </div>
+</code></pre></div>    </div>
   </li>
 </ul>
 
diff --git a/content/core-developers/accessing-application-session-request-objects.html b/content/core-developers/accessing-application-session-request-objects.html
index 26a62aa..49f7531 100644
--- a/content/core-developers/accessing-application-session-request-objects.html
+++ b/content/core-developers/accessing-application-session-request-objects.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -142,7 +141,7 @@
 
 <p><strong>Accessing servlet scopes</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">Map</span> <span class="n">attr</span> <span class="o">=</span> <span class="o">(</span><span class="n">Map</span><span class="o">)</span> <span class="n">ActionContext</span><span class="o">.</span><span class="na">getContext</span><span class="o">().</span><span class="na">get</span><span class="o">(</span><span class="s">"attr"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Map</span> <span class="n">attr</span> <span class="o">=</span> <span class="o">(</span><span class="n">Map</span><span class="o">)</span> <span class="n">ActionContext</span><span class="o">.</span><span class="na">getContext</span><span class="o">().</span><span class="na">get</span><span class="o">(</span><span class="s">"attr"</span><span class="o">);</span>
 <span class="n">attr</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"myId"</span><span class="o">,</span><span class="n">myProp</span><span class="o">);</span>
 
 <span class="n">Map</span> <span class="n">application</span> <span class="o">=</span> <span class="o">(</span><span class="n">Map</span><span class="o">)</span> <span class="n">ActionContext</span><span class="o">.</span><span class="na">getContext</span><span class="o">().</span><span class="na">get</span><span class="o">(</span><span class="s">"application"</span><span class="o">);</span>
@@ -153,8 +152,7 @@
 
 <span class="n">Map</span> <span class="n">request</span> <span class="o">=</span> <span class="o">(</span><span class="n">Map</span><span class="o">)</span> <span class="n">ActionContext</span><span class="o">.</span><span class="na">getContext</span><span class="o">().</span><span class="na">get</span><span class="o">(</span><span class="s">"request"</span><span class="o">);</span>
 <span class="n">request</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="s">"myId"</span><span class="o">,</span><span class="n">myProp</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <blockquote>
   <p>Do not use <code class="highlighter-rouge">ActionContext.getContext()</code> in the constructor of your Action class. The values may not be set up, and 
@@ -166,9 +164,8 @@ In general this isn’t recommended as it will tie our action to the servlet spe
 
 <p><strong>Setting session attribute through session object</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">ServletActionContext</span><span class="o">.</span><span class="na">getRequest</span><span class="o">().</span><span class="na">getSession</span><span class="o">().</span><span class="na">put</span><span class="o">(</span><span class="s">"myId"</span><span class="o">,</span> <span class="n">myProp</span><span class="o">);</span>
-</code></pre>
-</div>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">ServletActionContext</span><span class="o">.</span><span class="na">getRequest</span><span class="o">().</span><span class="na">getSession</span><span class="o">().</span><span class="na">put</span><span class="o">(</span><span class="s">"myId"</span><span class="o">,</span> <span class="n">myProp</span><span class="o">);</span>
+</code></pre></div></div>
 
 <p>Implementing <code class="highlighter-rouge">ServletRequestAware</code> or <code class="highlighter-rouge">ServletResponseAware</code>, combined with the <code class="highlighter-rouge">servletConfig</code> interceptor, 
 is an alternative way to access the request and response objects, with the same caveat.</p>
diff --git a/content/core-developers/action-chaining.html b/content/core-developers/action-chaining.html
index 9f6b794..169f840 100644
--- a/content/core-developers/action-chaining.html
+++ b/content/core-developers/action-chaining.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -146,7 +145,7 @@ with a <a href="chaining-interceptor.html">Chaining Interceptor</a>.</p>
 This Interceptor allows an Action to forward requests to a target Action, while propagating the state of the source Action. 
 Below is an example of how to define this sequence.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"public"</span> <span class="na">extends=</span><span class="s">"struts-default"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"public"</span> <span class="na">extends=</span><span class="s">"struts-default"</span><span class="nt">&gt;</span>
     <span class="c">&lt;!-- Chain creatAccount to login, using the default parameter --&gt;</span>
     <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"createAccount"</span> <span class="na">class=</span><span class="s">"..."</span><span class="nt">&gt;</span>
         <span class="nt">&lt;result</span> <span class="na">type=</span><span class="s">"chain"</span><span class="nt">&gt;</span>login<span class="nt">&lt;/result&gt;</span>
@@ -166,8 +165,7 @@ Below is an example of how to define this sequence.</p>
         <span class="nt">&lt;result&gt;</span>dashboard.jsp<span class="nt">&lt;/result&gt;</span>
     <span class="nt">&lt;/action&gt;</span>
 <span class="nt">&lt;/package&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Another action mapping in the same namespace (or the default “” namespace) can be executed after this action mapping 
 (see <a href="configuration-files.html">Configuration Files</a>). An optional “namespace” parameter may also be added to specify 
diff --git a/content/core-developers/action-configuration.html b/content/core-developers/action-configuration.html
index 8ffbf49..ce881da 100644
--- a/content/core-developers/action-configuration.html
+++ b/content/core-developers/action-configuration.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -158,18 +157,17 @@ the request.</p>
 
 <p><strong>A Logon Action</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"Logon"</span> <span class="na">class=</span><span class="s">"tutorial.Logon"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"Logon"</span> <span class="na">class=</span><span class="s">"tutorial.Logon"</span><span class="nt">&gt;</span>
   <span class="nt">&lt;result</span> <span class="na">type=</span><span class="s">"redirectAction"</span><span class="nt">&gt;</span>Menu<span class="nt">&lt;/result&gt;</span>
   <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"input"</span><span class="nt">&gt;</span>/Logon.jsp<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span> 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>When using <em>Convention Plugin</em> the action mapping can be configured with annotations:</p>
 
 <p><strong>A Logon Action with annotations</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="kn">package</span> <span class="n">tutorial</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">package</span> <span class="n">tutorial</span>
 
 <span class="nd">@Action</span><span class="o">(</span><span class="s">"Logon"</span><span class="o">)</span> <span class="c1">// actually that is not necessary as it is added by convention</span>
 <span class="nd">@Results</span><span class="o">(</span>
@@ -177,8 +175,7 @@ the request.</p>
 	<span class="nd">@Result</span><span class="o">(</span><span class="n">name</span><span class="o">=</span><span class="s">"input"</span><span class="o">,</span> <span class="n">location</span><span class="o">=</span><span class="s">"/Logon.jsp"</span><span class="o">)</span>
 <span class="o">)</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Logon</span> <span class="o">{</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="action-names">Action Names</h2>
 
@@ -193,21 +190,19 @@ to a Struts Action name (rather than a “raw” URI).</p>
 
 <p><strong>A Hello Form</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;s:form</span> <span class="na">action=</span><span class="s">"Hello"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;s:form</span> <span class="na">action=</span><span class="s">"Hello"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;s:textfield</span> <span class="na">label=</span><span class="s">"Please enter your name"</span> <span class="na">name=</span><span class="s">"name"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;s:submit/&gt;</span>
 <span class="nt">&lt;/s:form&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p><strong>Action Names With Slashes</strong></p>
 
 <p>If your action names have slashes in them (for example, <code class="highlighter-rouge">&lt;action name="admin/home" class="tutorial.Admin"/&gt;</code>) you need 
 to specifically allow slashes in your action names via a constant in the <code class="highlighter-rouge">struts.xml</code> file by specifying</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.enable.SlashesInActionNames"</span> <span class="na">value=</span><span class="s">"true"</span><span class="nt">/&gt;</span>
-</code></pre>
-</div>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.enable.SlashesInActionNames"</span> <span class="na">value=</span><span class="s">"true"</span><span class="nt">/&gt;</span>
+</code></pre></div></div>
 
 <p>See <a href="https://issues.apache.org/jira/browse/WW-1383">JIRA Issue WW-1383</a> for discussion as there are side effects 
 to setting this property to <code class="highlighter-rouge">true</code>.</p>
@@ -225,12 +220,11 @@ names (eg. createUser) or underscores (eg. my-action).</p>
 defined as follow: <code class="highlighter-rouge">[a-zA-Z0-9._!/-]*</code> - if at some point this doesn’t match your action naming schema you can define 
 your own RegEx and override the default using constant named <code class="highlighter-rouge">struts.allowed.action.names</code>, e.g.:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;struts&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;struts&gt;</span>
   <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.allowed.action.names"</span> <span class="na">value=</span><span class="s">"[a-z{}]"</span><span class="err">*</span><span class="nt">/&gt;</span>
   ...
 <span class="nt">&lt;/struts&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p><strong>NOTE</strong>: Please be aware that action names not matching the RegEx will rise an exception.</p>
 
@@ -240,11 +234,10 @@ your own RegEx and override the default using constant named <code class="highl
 
 <p><strong>Action interface</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">Action</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="n">String</span> <span class="n">execute</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">Action</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">execute</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span><span class="o">;</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <blockquote>
   <p>Implementing the Action interface is optional. If Action is not implemented, the framework will use reflection to 
@@ -255,11 +248,10 @@ look for an<code class="highlighter-rouge">execute</code> method.</p>
 Action, a developer might want separate entry-points for <code class="highlighter-rouge">create</code>, <code class="highlighter-rouge">retrieve</code>, <code class="highlighter-rouge">update</code>, and <code class="highlighter-rouge">delete</code>. A different 
 entry point can be specified by the <code class="highlighter-rouge">method</code> attribute.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"delete"</span> <span class="na">class=</span><span class="s">"example.CrudAction"</span> <span class="na">method=</span><span class="s">"delete"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"delete"</span> <span class="na">class=</span><span class="s">"example.CrudAction"</span> <span class="na">method=</span><span class="s">"delete"</span><span class="nt">&gt;</span>
     ...
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <blockquote>
   <p>If there is no <code class="highlighter-rouge">execute</code> method and no other method specified in the configuration the framework will throw an exception.</p>
@@ -269,13 +261,12 @@ entry point can be specified by the <code class="highlighter-rouge">method</code
 
 <p><strong>Annotated action method</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nd">@Action</span><span class="o">(</span><span class="s">"crud"</span><span class="o">)</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@Action</span><span class="o">(</span><span class="s">"crud"</span><span class="o">)</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">CrudAction</span> <span class="o">{</span>
     <span class="nd">@Action</span><span class="o">(</span><span class="s">"delete"</span><span class="o">)</span>
-    <span class="kd">public</span> <span class="n">String</span> <span class="n">delete</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">delete</span><span class="o">()</span> <span class="o">{</span>
         <span class="o">...</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="wildcard-method">Wildcard Method</h2>
 
@@ -285,10 +276,9 @@ but call the <code class="highlighter-rouge">delete</code> method instead.</p>
 
 <p>Rather than code a separate mapping for each action class that uses this pattern, you can write it once as a wildcard mapping.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"*Crud"</span> <span class="na">class=</span><span class="s">"example.Crud"</span> <span class="na">method=</span><span class="s">"{1}"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"*Crud"</span> <span class="na">class=</span><span class="s">"example.Crud"</span> <span class="na">method=</span><span class="s">"{1}"</span><span class="nt">&gt;</span>
     ...
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Here, a reference to “editCrud” will call the <code class="highlighter-rouge">edit</code> method on an instance of the Crud Action class. Likewise, 
 a reference to “deleteCrud” will call the <code class="highlighter-rouge">delete</code> method instead.</p>
@@ -303,9 +293,8 @@ or other special character.</p>
 
 <p>To use a postfix wildcard, just move the asterisk and add an underscore.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"Crud_*"</span> <span class="na">class=</span><span class="s">"example.Crud"</span> <span class="na">method=</span><span class="s">"{1}"</span><span class="nt">&gt;</span>
-</code></pre>
-</div>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"Crud_*"</span> <span class="na">class=</span><span class="s">"example.Crud"</span> <span class="na">method=</span><span class="s">"{1}"</span><span class="nt">&gt;</span>
+</code></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 
@@ -362,7 +351,7 @@ the specific actions that have <code class="highlighter-rouge">&lt;allowed-metho
 
 <p><strong>Example struts.xml</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="cp">&lt;?xml version="1.0" encoding="UTF-8" ?&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="cp">&lt;?xml version="1.0" encoding="UTF-8" ?&gt;</span>
 <span class="cp">&lt;!DOCTYPE struts PUBLIC
     "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
     "http://struts.apache.org/dtds/struts-2.3.dtd"&gt;</span>
@@ -384,8 +373,7 @@ the specific actions that have <code class="highlighter-rouge">&lt;allowed-metho
 
   <span class="nt">&lt;/package&gt;</span>
 <span class="nt">&lt;/struts&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="strict-method-invocation">Strict Method Invocation</h3>
 
@@ -397,15 +385,14 @@ of the new configuration option please use the latest DTD definition:</p>
 
 <p><strong>Struts 2.5 DTD</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="cp">&lt;?xml version="1.0" encoding="UTF-8" ?&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="cp">&lt;?xml version="1.0" encoding="UTF-8" ?&gt;</span>
 <span class="cp">&lt;!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
         "http://struts.apache.org/dtds/struts-2.5.dtd"&gt;</span>
 <span class="nt">&lt;struts&gt;</span>
 ...
 <span class="nt">&lt;/struts&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>SMI works in the following way:</p>
 
@@ -419,9 +406,8 @@ actions (plus adding <code class="highlighter-rouge">&lt;global-allowed-methods/
 
 <p>You can redefine the default RegEx by using a constant as follow </p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.strictMethodInvocation.methodRegex"</span> <span class="na">value=</span><span class="s">"([a-zA-Z]*)"</span><span class="nt">/&gt;</span>
-</code></pre>
-</div>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.strictMethodInvocation.methodRegex"</span> <span class="na">value=</span><span class="s">"([a-zA-Z]*)"</span><span class="nt">/&gt;</span>
+</code></pre></div></div>
 
 <p>When using wildcard mapping in actions’ definitions SMI works in two ways:</p>
 
@@ -437,7 +423,7 @@ by annotations or <code class="highlighter-rouge">&lt;allowed-method/&gt;</code>
 
 <p><strong>SMI via struts.xml</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="err">...</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="err">...</span><span class="nt">&gt;</span>
   ...
   <span class="nt">&lt;global-allowed-methods&gt;</span>execute,input,back,cancel,browse<span class="nt">&lt;/global-allowed-methods&gt;</span>
   ...
@@ -448,31 +434,28 @@ by annotations or <code class="highlighter-rouge">&lt;allowed-method/&gt;</code>
  
   ...
 <span class="nt">&lt;/package&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p><strong>SMI via annotation on action class level</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nd">@AllowedMethods</span><span class="o">(</span><span class="s">"end"</span><span class="o">)</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@AllowedMethods</span><span class="o">(</span><span class="s">"end"</span><span class="o">)</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">ClassLevelAllowedMethodsAction</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="n">String</span> <span class="n">execute</span><span class="o">()</span> <span class="o">{</span> 
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">execute</span><span class="o">()</span> <span class="o">{</span> 
         <span class="k">return</span> <span class="o">...</span>
     <span class="o">}</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p><strong>SMI via annotation on package level (in package-info.java)</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nd">@org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">struts2</span><span class="o">.</span><span class="na">convention</span><span class="o">.</span><span class="na">annotation</span><span class="o">.</span><span class="na">AllowedMethods</span><span class="o">({</span><span class="s">"home"</span><span class="o">,</span> <span class="s">"start"</span><span cl [...]
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nd">@org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">struts2</span><span class="o">.</span><span class="na">convention</span><span class="o">.</span><span class="na">annotation</span><span class="o">.</span><span class="na">AllowedMethods</span><span class="o">({</span><span class="s">"home"</span><span class="o">,</span> < [...]
 <span class="kn">package</span> <span class="n">org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">struts2</span><span class="o">.</span><span class="na">convention</span><span class="o">.</span><span class="na">actions</span><span class="o">.</span><span class="na">allowedmethods</span><span class="o">;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Allowed methods can be defined as:</p>
 
 <ul>
-  <li>literals ie. in xml: <code class="highlighter-rouge">execute,cancel</code> or in annotation: <code class="highlighter-rouge"><span class="p">{</span><span class="nt">"execute"</span><span class="err">,</span><span class="w"> </span><span class="nt">"cancel"</span><span class="err">}</span></code></li>
+  <li>literals ie. in xml: <code class="highlighter-rouge">execute,cancel</code> or in annotation: <code class="highlighter-rouge">{"execute", "cancel"}</code></li>
   <li>patterns when using with wildcard mapping, i.e <code class="highlighter-rouge">&lt;action ... method="do{2}"/&gt;</code></li>
   <li>RegExs using <code class="highlighter-rouge">regex:</code> prefix, ie: <code class="highlighter-rouge">&lt;global-allowed-methods&gt;execute,input,cancel,regex:user([A-Z]*)&lt;/global-allowed-methods&gt;</code></li>
 </ul>
@@ -486,11 +469,10 @@ code as by default only execute method is allowed, even when SMI is disabled.</p
 <p>If the class attribute in an action mapping is left blank, the <code class="highlighter-rouge">com.opensymphony.xwork2.ActionSupport</code> class is used 
 as a default.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"Hello"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"Hello"</span><span class="nt">&gt;</span>
    // ...
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <blockquote>
   <p>The ActionSupport class has an <code class="highlighter-rouge">execute</code> method that returns “success” and an <code class="highlighter-rouge">input</code> method that returns “input”.</p>
@@ -515,12 +497,11 @@ The form simply submits back to the action that created it.</p>
 
 <p><strong>Posting Back</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;s:form&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;s:form&gt;</span>
     <span class="nt">&lt;s:textfield</span> <span class="na">label=</span><span class="s">"Please enter your name"</span> <span class="na">name=</span><span class="s">"name"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;s:submit/&gt;</span>
 <span class="nt">&lt;/s:form&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="action-default">Action Default</h2>
 
@@ -528,7 +509,7 @@ The form simply submits back to the action that created it.</p>
 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="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"Hello"</span> <span class="na">extends=</span><span class="s">"action-default"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"Hello"</span> <span class="na">extends=</span><span class="s">"action-default"</span><span class="nt">&gt;</span>
 
     <span class="nt">&lt;default-action-ref</span> <span class="na">name=</span><span class="s">"UnderConstruction"</span><span class="nt">/&gt;</span>
 
@@ -537,8 +518,7 @@ you can specify a default action. If no other action matches, the default action
     <span class="nt">&lt;/action&gt;</span>
 
     ...
-</code></pre>
-</div>
+</code></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>
@@ -554,11 +534,10 @@ multiple packages declaring a default action with the same namespace, there is n
 
 <p>Using wildcards is another approach to default actions. A wildcard action at the end of the configuration can be used to catch unmatched references.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"*"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"*"</span><span class="nt">&gt;</span>
   <span class="nt">&lt;result&gt;</span>/{1}.jsp<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>When a new action is needed, just add a stub page.</p>
 
diff --git a/content/core-developers/action-event-listener.html b/content/core-developers/action-event-listener.html
index d956055..22d9c5c 100644
--- a/content/core-developers/action-event-listener.html
+++ b/content/core-developers/action-event-listener.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -140,29 +139,27 @@ during processing the action.</p>
 <p>Right now there can be only one instance of <code class="highlighter-rouge">ActionEventListener</code> for the whole Struts2 application. You can configure 
 it via <code class="highlighter-rouge">struts.xml</code> by adding bean definition:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;bean</span> <span class="na">type=</span><span class="s">"com.opensymphony.xwork2.ActionEventListener"</span> <span class="na">class=</span><span class="s">"com.demo.MyActionEventListener"</span><span class="nt">/&gt;</span>
-</code></pre>
-</div>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;bean</span> <span class="na">type=</span><span class="s">"com.opensymphony.xwork2.ActionEventListener"</span> <span class="na">class=</span><span class="s">"com.demo.MyActionEventListener"</span><span class="nt">/&gt;</span>
+</code></pre></div></div>
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MyActionEventListener</span> <span class="kd">implements</span> <span class="n">ActionEventListener</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MyActionEventListener</span> <span class="kd">implements</span> <span class="n">ActionEventListener</span> <span class="o">{</span>
 
-    <span class="kd">public</span> <span class="n">Object</span> <span class="n">prepare</span><span class="o">(</span><span class="n">Object</span> <span class="n">action</span><span class="o">,</span> <span class="n">ValueStack</span> <span class="n">stack</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Object</span> <span class="nf">prepare</span><span class="o">(</span><span class="n">Object</span> <span class="n">action</span><span class="o">,</span> <span class="n">ValueStack</span> <span class="n">stack</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">if</span> <span class="o">(</span><span class="n">action</span> <span class="k">instanceof</span> <span class="n">MyBaseAction</span><span class="o">)</span> <span class="o">{</span>
             <span class="o">((</span><span class="n">MyBaseAction</span><span class="o">)</span><span class="n">action</span><span class="o">).</span><span class="na">setUserService</span><span class="o">(</span><span class="n">stack</span><span class="o">.</span><span class="na">findValue</span><span class="o">(</span><span class="s">"userService"</span><span class="o">));</span>
         <span class="o">}</span>
     <span class="o">}</span>
     
-    <span class="kd">public</span> <span class="n">String</span> <span class="n">handleException</span><span class="o">(</span><span class="n">Throwable</span> <span class="n">t</span><span class="o">,</span> <span class="n">ValueStack</span> <span class="n">stack</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">handleException</span><span class="o">(</span><span class="n">Throwable</span> <span class="n">t</span><span class="o">,</span> <span class="n">ValueStack</span> <span class="n">stack</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">if</span> <span class="o">(</span><span class="n">t</span> <span class="k">instanceof</span> <span class="n">MyBusinessException</span><span class="o">)</span> <span class="o">{</span>
             <span class="k">return</span> <span class="n">stack</span><span class="o">.</span><span class="na">findString</span><span class="o">(</span><span class="s">"defaultBusinesResult"</span><span class="o">);</span>
         <span class="o">}</span>
         <span class="k">return</span> <span class="kc">null</span><span class="o">;</span>
     <span class="o">}</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/action-mapper.html b/content/core-developers/action-mapper.html
index b2608dd..25f47a5 100644
--- a/content/core-developers/action-mapper.html
+++ b/content/core-developers/action-mapper.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -191,13 +190,12 @@ to be something else), the baz action’s <code class="highlighter-rouge">anoth
 clicked. Alternatively, one would have submit button set a particular value on the action when clicked, and the <code class="highlighter-rouge">execute()</code>
 method decides on what to do with the setted value depending on which button is clicked.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;s:form</span> <span class="na">action=</span><span class="s">"baz"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;s:form</span> <span class="na">action=</span><span class="s">"baz"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;s:textfield</span> <span class="na">label=</span><span class="s">"Enter your name"</span> <span class="na">name=</span><span class="s">"person.name"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;s:submit</span> <span class="na">value=</span><span class="s">"Create person"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;s:submit</span> <span class="na">method=</span><span class="s">"anotherMethod"</span> <span class="na">value=</span><span class="s">"Cancel"</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;/s:form&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="action-prefix">Action prefix</h3>
 
@@ -205,13 +203,12 @@ method decides on what to do with the setted value depending on which button is
 to be something else), the anotherAction action’s <code class="highlighter-rouge">execute()</code> method (assuming again if it isn’t overridden with something 
 else in <code class="highlighter-rouge">struts.xml</code>) will be executed.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;s:form</span> <span class="na">action=</span><span class="s">"baz"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;s:form</span> <span class="na">action=</span><span class="s">"baz"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;s:textfield</span> <span class="na">label=</span><span class="s">"Enter your name"</span> <span class="na">name=</span><span class="s">"person.name"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;s:submit</span> <span class="na">value=</span><span class="s">"Create person"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;s:submit</span> <span class="na">action=</span><span class="s">"anotherAction"</span> <span class="na">value=</span><span class="s">"Cancel"</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;/s:form&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="allowed-action-name-regex">Allowed action name RegEx</h3>
 
@@ -235,11 +232,10 @@ is enabled.</p>
 <p>You can define your own ActionMapper by implementing <code class="highlighter-rouge">org.apache.struts2.dispatcher.mapper.ActionMapper</code> then configuring 
 Struts 2 to use the new class in <code class="highlighter-rouge">struts.xml</code></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;bean</span> <span class="na">type=</span><span class="s">"org.apache.struts2.dispatcher.mapper.ActionMapper"</span> <span class="na">name=</span><span class="s">"mymapper"</span> <span class="na">class=</span><span class="s">"com.mycompany.myapp.MyActionMapper"</span> <span class="nt">/&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;bean</span> <span class="na">type=</span><span class="s">"org.apache.struts2.dispatcher.mapper.ActionMapper"</span> <span class="na">name=</span><span class="s">"mymapper"</span> <span class="na">class=</span><span class="s">"com.mycompany.myapp.MyActionMapper"</span> <span class="nt">/&gt;</span>
 
 <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.class"</span> <span class="na">value=</span><span class="s">"mymapper"</span> <span class="nt">/&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <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>
@@ -251,10 +247,9 @@ would be similar to a request to <strong>/getPerson.action?personID=1</strong> u
 
 <p>It is configured through <a href="struts-xml.html">struts.xml</a>. For example, with the following entries in <code class="highlighter-rouge">struts.xml</code></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.class"</span> <span class="na">value=</span><span class="s">"composite"</span> <span class="nt">/&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.class"</span> <span class="na">value=</span><span class="s">"composite"</span> <span class="nt">/&gt;</span>
 <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.composite"</span> <span class="na">value=</span><span class="s">"struts,restful,restful2"</span> <span class="nt">/&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>When <code class="highlighter-rouge">CompositeActionMapper#getMapping(HttpServletRequest, ConfigurationManager)</code> or <code class="highlighter-rouge">CompositeActionMapper#getUriFromActionMapping(ActionMapping)</code>
 is invoked, <code class="highlighter-rouge">CompositeActionMapper</code> would go through these s in sequence starting from identified by <code class="highlighter-rouge">struts.mapper.composite.1</code>, 
@@ -265,10 +260,9 @@ methods.</p>
 
 <p>For example with the following in struts.xml:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.class"</span> <span class="na">value=</span><span class="s">"composite"</span> <span class="nt">/&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.class"</span> <span class="na">value=</span><span class="s">"composite"</span> <span class="nt">/&gt;</span>
 <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.composite"</span> <span class="na">value=</span><span class="s">"struts,restful"</span> <span class="nt">/&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p><code class="highlighter-rouge">CompositeActionMapper</code> will be configured with 2 ActionMapper, namely “struts” which is <code class="highlighter-rouge">org.apache.struts2.dispatcher.mapper.DefaultActionMapper</code>
 and “restful” which is <code class="highlighter-rouge">org.apache.struts2.dispatcher.mapper.RestfulActionMapperRestfulActionMapper</code>.</p>
@@ -280,23 +274,22 @@ and “restful” which is <code class="highlighter-rouge">org.apache.struts2.di
 <p>A prefix based action mapper that is capable of delegating to other <code class="highlighter-rouge">ActionMapper</code>s based on the request’s prefix.
 It is configured through <code class="highlighter-rouge">struts.xml</code>. For example, with the following entries in <code class="highlighter-rouge">struts.xml</code>:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.class"</span> <span class="na">value=</span><span class="s">"prefix"</span><span class="nt">/&gt;</span>
-
-<span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.prefixMapping"</span> <span class="na">value=</span><span class="s">"</span>
-  <span class="err">/communities:pseudoRestful,</span>
-  <span class="err">/communityTags:pseudoRestful,</span>
-  <span class="err">/events:pseudoRestful,</span>
-  <span class="err">/mediaList:pseudoRestful,</span>
-  <span class="err">/users:pseudoRestful,</span>
-  <span class="err">/community:struts,</span>
-  <span class="err">/communityTag:struts,</span>
-  <span class="err">/event:struts,</span>
-  <span class="err">/media:struts,</span>
-  <span class="err">/user:struts,</span>
-  <span class="err">:struts</span>
-<span class="err">"</span><span class="nt">/&gt;</span>
-</code></pre>
-</div>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.class"</span> <span class="na">value=</span><span class="s">"prefix"</span><span class="nt">/&gt;</span>
+
+<span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.prefixMapping"</span> <span class="na">value=</span><span class="s">"
+  /communities:pseudoRestful,
+  /communityTags:pseudoRestful,
+  /events:pseudoRestful,
+  /mediaList:pseudoRestful,
+  /users:pseudoRestful,
+  /community:struts,
+  /communityTag:struts,
+  /event:struts,
+  /media:struts,
+  /user:struts,
+  :struts
+"</span><span class="nt">/&gt;</span>
+</code></pre></div></div>
 <p>When <code class="highlighter-rouge">PrefixBasedActionMapper#getMapping(HttpServletRequest, ConfigurationManager)</code> or <code class="highlighter-rouge">PrefixBasedActionMapper#getUriFromActionMapping(ActionMapping)</code>
 is invoked, <code class="highlighter-rouge">PrefixBasedActionMapper</code> will check each possible prefix (url prefix terminating just before a <code class="highlighter-rouge">/</code>) to find 
 the most specific <code class="highlighter-rouge">ActionMapper</code> that returns a mapping when asked to map the request. If none are found, null is returned 
@@ -310,15 +303,13 @@ appropriate <code class="highlighter-rouge">com.opensymphony.xwork2.ActionProxyF
 
 <p>Add below entry to <code class="highlighter-rouge">struts.xml</code> to enable the factory:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.actionProxyFactory"</span> <span class="na">value=</span><span class="s">"prefix"</span><span class="nt">/&gt;</span>
-</code></pre>
-</div>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.actionProxyFactory"</span> <span class="na">value=</span><span class="s">"prefix"</span><span class="nt">/&gt;</span>
+</code></pre></div></div>
 
 <p>The factory will use the same set of patterns as defined with:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.prefixMapping"</span> <span class="na">value=</span><span class="s">"..."</span><span class="nt">/&gt;</span>
-</code></pre>
-</div>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.prefixMapping"</span> <span class="na">value=</span><span class="s">"..."</span><span class="nt">/&gt;</span>
+</code></pre></div></div>
 
 <h2 id="actionmapper-and-actionmapping-objects">ActionMapper and ActionMapping objects</h2>
 
@@ -331,24 +322,22 @@ entry in <code class="highlighter-rouge">struts.xml</code>. Note that the value
 
 <p>Custom ActionMapper must implement ActionMapper interface and have a default constructor.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;bean</span> <span class="na">type=</span><span class="s">"org.apache.struts2.dispatcher.mapper.ActionMapper"</span> <span class="na">name=</span><span class="s">"mymapper"</span> <span class="na">class=</span><span class="s">"com.mycompany.myapp.MyActionMapper"</span> <span class="nt">/&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;bean</span> <span class="na">type=</span><span class="s">"org.apache.struts2.dispatcher.mapper.ActionMapper"</span> <span class="na">name=</span><span class="s">"mymapper"</span> <span class="na">class=</span><span class="s">"com.mycompany.myapp.MyActionMapper"</span> <span class="nt">/&gt;</span>
 
 <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.mapper.class"</span> <span class="na">value=</span><span class="s">"mymapper"</span> <span class="nt">/&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MyCustomActionMapper</span> <span class="kd">implements</span> <span class="n">ActionMapper</span> <span class="o">{</span>
-  <span class="kd">public</span> <span class="n">ActionMapping</span> <span class="n">getMapping</span><span class="o">(</span><span class="n">HttpServletRequest</span> <span class="n">request</span><span class="o">,</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MyCustomActionMapper</span> <span class="kd">implements</span> <span class="n">ActionMapper</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="n">ActionMapping</span> <span class="nf">getMapping</span><span class="o">(</span><span class="n">HttpServletRequest</span> <span class="n">request</span><span class="o">,</span>
                                   <span class="n">ConfigurationManager</span> <span class="n">configManager</span><span class="o">)</span> <span class="o">{</span>
     <span class="o">....</span>
   <span class="o">}</span>
 
-  <span class="kd">public</span> <span class="n">String</span> <span class="n">getUriFromActionMapping</span><span class="o">(</span><span class="n">ActionMapping</span> <span class="n">mapping</span><span class="o">)</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="n">String</span> <span class="nf">getUriFromActionMapping</span><span class="o">(</span><span class="n">ActionMapping</span> <span class="n">mapping</span><span class="o">)</span> <span class="o">{</span>
     <span class="o">....</span>
   <span class="o">}</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <blockquote>
   <p>See also: <a href="restful-action-mapper.html">RestfulActionMapper</a></p>
diff --git a/content/core-developers/action-proxy-and-actionproxy-factory.html b/content/core-developers/action-proxy-and-actionproxy-factory.html
index 51735a6..a0b1ac5 100644
--- a/content/core-developers/action-proxy-and-actionproxy-factory.html
+++ b/content/core-developers/action-proxy-and-actionproxy-factory.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -157,24 +156,23 @@ s executed when a request is invoked.</p>
 
 <h3 id="actionproxyfactory">ActionProxyFactory</h3>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="n">ActionProxyFactory</span><span class="o">.</span><span class="na">setFactory</span><span class="o">(</span><span class="k">new</span> <span class="n">MyActionProxyFactory</span><span class="o">()</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">ActionProxyFactory</span><span class="o">.</span><span class="na">setFactory</span><span class="o">(</span><span class="k">new</span> <span class="n">MyActionProxyFactory</span><span class="o">()</span> <span class="o">{</span>
 
     <span class="c1">// Do something interesting...</span>
 
  <span class="o">});</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="actionproxy">ActionProxy</h3>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="n">ActionProxyFactory</span><span class="o">.</span><span class="na">getFactory</span><span class="o">(</span><span class="k">new</span> <span class="n">MyActionProxyFactory</span><span class="o">()</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">ActionProxyFactory</span><span class="o">.</span><span class="na">getFactory</span><span class="o">(</span><span class="k">new</span> <span class="n">MyActionProxyFactory</span><span class="o">()</span> <span class="o">{</span>
     <span class="o">....</span>
-    <span class="kd">public</span> <span class="n">ActionProxy</span> <span class="n">createActionProxy</span><span class="o">(</span><span class="n">Configuration</span> <span class="n">config</span><span class="o">,</span>
+    <span class="kd">public</span> <span class="n">ActionProxy</span> <span class="nf">createActionProxy</span><span class="o">(</span><span class="n">Configuration</span> <span class="n">config</span><span class="o">,</span>
            <span class="n">String</span> <span class="n">namespace</span><span class="o">,</span> <span class="n">String</span> <span class="n">actionName</span><span class="o">,</span> <span class="n">Map</span> <span class="n">extraContext</span><span class="o">)</span>
            <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
         <span class="n">createActionProxy</span><span class="o">(</span><span class="n">config</span><span class="o">,</span> <span class="n">namespace</span><span class="o">,</span> <span class="n">actionName</span><span class="o">,</span> <span class="n">extraContext</span><span class="o">,</span> <span class="kc">true</span><span class="o">);</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">ActionProxy</span> <span class="n">createActionProxy</span><span class="o">(</span><span class="n">Configuration</span> <span class="n">config</span><span class="o">,</span>
+    <span class="kd">public</span> <span class="n">ActionProxy</span> <span class="nf">createActionProxy</span><span class="o">(</span><span class="n">Configuration</span> <span class="n">config</span><span class="o">,</span>
            <span class="n">String</span> <span class="n">namespace</span><span class="o">,</span> <span class="n">String</span> <span class="n">actionName</span><span class="o">,</span> <span class="n">Map</span> <span class="n">extraContext</span><span class="o">,</span>
            <span class="kt">boolean</span> <span class="n">executeResult</span><span class="o">,</span> <span class="kt">boolean</span> <span class="n">cleanupContext</span><span class="o">)</span>
            <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
@@ -182,22 +180,21 @@ s executed when a request is invoked.</p>
    <span class="o">}</span>
    <span class="o">....</span>
  <span class="o">});</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="actioninvocation">ActionInvocation</h3>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="n">ActionProxyFactory</span><span class="o">.</span><span class="na">getFactory</span><span class="o">(</span><span class="k">new</span> <span class="n">MyActionProxyFactory</span><span class="o">()</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="n">ActionProxyFactory</span><span class="o">.</span><span class="na">getFactory</span><span class="o">(</span><span class="k">new</span> <span class="n">MyActionProxyFactory</span><span class="o">()</span> <span class="o">{</span>
     <span class="o">...</span>
-    <span class="kd">public</span> <span class="n">ActionInvocation</span> <span class="n">createActionInvocation</span><span class="o">(</span><span class="n">ActionProxy</span> <span class="n">actionProxy</span><span class="o">)</span>
+    <span class="kd">public</span> <span class="n">ActionInvocation</span> <span class="nf">createActionInvocation</span><span class="o">(</span><span class="n">ActionProxy</span> <span class="n">actionProxy</span><span class="o">)</span>
                             <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
           <span class="n">createActionInvocation</span><span class="o">(</span><span class="n">actionProxy</span><span class="o">,</span> <span class="k">new</span> <span class="n">LinkedHashMap</span><span class="o">());</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">ActionInvocation</span> <span class="n">createActionInvocation</span><span class="o">(</span><span class="n">ActionProxy</span> <span class="n">actionProxy</span><span class="o">,</span>
+    <span class="kd">public</span> <span class="n">ActionInvocation</span> <span class="nf">createActionInvocation</span><span class="o">(</span><span class="n">ActionProxy</span> <span class="n">actionProxy</span><span class="o">,</span>
                             <span class="n">Map</span> <span class="n">extraContext</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
           <span class="n">createActionInvocation</span><span class="o">(</span><span class="n">actionProxy</span><span class="o">,</span> <span class="n">extraContext</span><span class="o">,</span> <span class="kc">true</span><span class="o">);</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">ActionInvocation</span> <span class="n">createActionInvocation</span><span class="o">(</span><span class="n">ActionProxy</span> <span class="n">actionProxy</span><span class="o">,</span>
+    <span class="kd">public</span> <span class="n">ActionInvocation</span> <span class="nf">createActionInvocation</span><span class="o">(</span><span class="n">ActionProxy</span> <span class="n">actionProxy</span><span class="o">,</span>
                             <span class="n">Map</span> <span class="n">extraContext</span><span class="o">,</span> <span class="kt">boolean</span> <span class="n">pushAction</span><span class="o">)</span>
                             <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
           <span class="c1">// Do implementation of ActionInvocation here</span>
@@ -205,8 +202,7 @@ s executed when a request is invoked.</p>
     <span class="o">}</span>
     <span class="o">...</span>
  <span class="o">});</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/after-annotation.html b/content/core-developers/after-annotation.html
index f8f2f7e..442adcc 100644
--- a/content/core-developers/after-annotation.html
+++ b/content/core-developers/after-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -146,20 +145,19 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">SampleAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">SampleAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
 
   <span class="nd">@After</span>
-  <span class="kd">public</span> <span class="kt">void</span> <span class="n">isValid</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">ValidationException</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="kt">void</span> <span class="nf">isValid</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">ValidationException</span> <span class="o">{</span>
     <span class="c1">// validate model object, throw exception if failed</span>
   <span class="o">}</span>
 
-  <span class="kd">public</span> <span class="n">String</span> <span class="n">execute</span><span class="o">()</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="n">String</span> <span class="nf">execute</span><span class="o">()</span> <span class="o">{</span>
      <span class="c1">// perform action</span>
      <span class="k">return</span> <span class="n">SUCCESS</span><span class="o">;</span>
   <span class="o">}</span>
  <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/ajax-client-side-validation.html b/content/core-developers/ajax-client-side-validation.html
index 88e58ff..c1e76e9 100644
--- a/content/core-developers/ajax-client-side-validation.html
+++ b/content/core-developers/ajax-client-side-validation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -159,7 +158,7 @@
 
 <p><strong>Create the action class</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">AjaxFormSubmitAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">AjaxFormSubmitAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
     <span class="kd">private</span> <span class="n">String</span> <span class="n">requiredValidatorField</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
     <span class="kd">private</span> <span class="n">String</span> <span class="n">requiredStringValidatorField</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
     <span class="kd">private</span> <span class="n">Integer</span> <span class="n">integerValidatorField</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
@@ -170,59 +169,59 @@
     <span class="kd">private</span> <span class="n">String</span> <span class="n">regexValidatorField</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
     <span class="kd">private</span> <span class="n">String</span> <span class="n">fieldExpressionValidatorField</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
     <span class="nd">@Override</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="n">validate</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">validate</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">if</span> <span class="o">(</span><span class="n">hasFieldErrors</span><span class="o">())</span> <span class="o">{</span>
             <span class="n">addActionError</span><span class="o">(</span><span class="s">"Errors present!"</span><span class="o">);</span>
         <span class="o">}</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">Date</span> <span class="n">getDateValidatorField</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Date</span> <span class="nf">getDateValidatorField</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">dateValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
     <span class="nd">@DateRangeFieldValidator</span><span class="o">(</span>
         <span class="n">min</span><span class="o">=</span><span class="s">"01/01/1990"</span><span class="o">,</span> 
         <span class="n">max</span><span class="o">=</span><span class="s">"01/01/2000"</span><span class="o">,</span> 
         <span class="n">message</span><span class="o">=</span><span class="s">"must be a min 01-01-1990 max 01-01-2000 if supplied"</span><span class="o">)</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="n">setDateValidatorField</span><span class="o">(</span><span class="n">Date</span> <span class="n">dateValidatorField</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setDateValidatorField</span><span class="o">(</span><span class="n">Date</span> <span class="n">dateValidatorField</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">this</span><span class="o">.</span><span class="na">dateValidatorField</span> <span class="o">=</span> <span class="n">dateValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">String</span> <span class="n">getEmailValidatorField</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">getEmailValidatorField</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">emailValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
     <span class="nd">@EmailValidator</span><span class="o">(</span><span class="n">message</span><span class="o">=</span><span class="s">"must be a valid email if supplied"</span><span class="o">)</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="n">setEmailValidatorField</span><span class="o">(</span><span class="n">String</span> <span class="n">emailValidatorField</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setEmailValidatorField</span><span class="o">(</span><span class="n">String</span> <span class="n">emailValidatorField</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">this</span><span class="o">.</span><span class="na">emailValidatorField</span> <span class="o">=</span> <span class="n">emailValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">Integer</span> <span class="n">getIntegerValidatorField</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Integer</span> <span class="nf">getIntegerValidatorField</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">integerValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
     <span class="nd">@IntRangeFieldValidator</span><span class="o">(</span><span class="n">min</span><span class="o">=</span><span class="s">"1"</span><span class="o">,</span> <span class="n">max</span><span class="o">=</span><span class="s">"10"</span><span class="o">,</span> <span class="n">message</span><span class="o">=</span><span class="s">"must be integer min 1 max 10 if supplied"</span><span class="o">)</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="n">setIntegerValidatorField</span><span class="o">(</span><span class="n">Integer</span> <span class="n">integerValidatorField</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setIntegerValidatorField</span><span class="o">(</span><span class="n">Integer</span> <span class="n">integerValidatorField</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">this</span><span class="o">.</span><span class="na">integerValidatorField</span> <span class="o">=</span> <span class="n">integerValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">String</span> <span class="n">getRegexValidatorField</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">getRegexValidatorField</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">regexValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
     <span class="nd">@RegexFieldValidator</span><span class="o">(</span>
         <span class="n">regex</span><span class="o">=</span><span class="s">"[^&lt;&gt;]+"</span><span class="o">,</span> 
         <span class="n">message</span><span class="o">=</span><span class="s">"regexValidatorField must match a regexp (.*\\.txt) if specified"</span><span class="o">)</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="n">setRegexValidatorField</span><span class="o">(</span><span class="n">String</span> <span class="n">regexValidatorField</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setRegexValidatorField</span><span class="o">(</span><span class="n">String</span> <span class="n">regexValidatorField</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">this</span><span class="o">.</span><span class="na">regexValidatorField</span> <span class="o">=</span> <span class="n">regexValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">String</span> <span class="n">getRequiredStringValidatorField</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">getRequiredStringValidatorField</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">requiredStringValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
     <span class="nd">@RequiredStringValidator</span><span class="o">(</span><span class="n">trim</span><span class="o">=</span><span class="kc">true</span><span class="o">,</span> <span class="n">message</span><span class="o">=</span><span class="s">"required and must be string"</span><span class="o">)</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="n">setRequiredStringValidatorField</span><span class="o">(</span><span class="n">String</span> <span class="n">requiredStringValidatorField</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setRequiredStringValidatorField</span><span class="o">(</span><span class="n">String</span> <span class="n">requiredStringValidatorField</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">this</span><span class="o">.</span><span class="na">requiredStringValidatorField</span> <span class="o">=</span> <span class="n">requiredStringValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">String</span> <span class="n">getRequiredValidatorField</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">getRequiredValidatorField</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">requiredValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
     <span class="nd">@RequiredFieldValidator</span><span class="o">(</span><span class="n">message</span><span class="o">=</span><span class="s">"required"</span><span class="o">)</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="n">setRequiredValidatorField</span><span class="o">(</span><span class="n">String</span> <span class="n">requiredValidatorField</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setRequiredValidatorField</span><span class="o">(</span><span class="n">String</span> <span class="n">requiredValidatorField</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">this</span><span class="o">.</span><span class="na">requiredValidatorField</span> <span class="o">=</span> <span class="n">requiredValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">String</span> <span class="n">getStringLengthValidatorField</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">getStringLengthValidatorField</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">stringLengthValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
     <span class="nd">@StringLengthFieldValidator</span><span class="o">(</span>
@@ -230,29 +229,28 @@
         <span class="n">maxLength</span><span class="o">=</span><span class="s">"4"</span><span class="o">,</span> 
         <span class="n">trim</span><span class="o">=</span><span class="kc">true</span><span class="o">,</span> 
         <span class="n">message</span><span class="o">=</span><span class="s">"must be a String of a specific greater than 1 less than 5 if specified"</span><span class="o">)</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="n">setStringLengthValidatorField</span><span class="o">(</span><span class="n">String</span> <span class="n">stringLengthValidatorField</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setStringLengthValidatorField</span><span class="o">(</span><span class="n">String</span> <span class="n">stringLengthValidatorField</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">this</span><span class="o">.</span><span class="na">stringLengthValidatorField</span> <span class="o">=</span> <span class="n">stringLengthValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">String</span> <span class="n">getFieldExpressionValidatorField</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">getFieldExpressionValidatorField</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">fieldExpressionValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
     <span class="nd">@FieldExpressionValidator</span><span class="o">(</span>
         <span class="n">expression</span> <span class="o">=</span> <span class="s">"(fieldExpressionValidatorField == requiredValidatorField)"</span><span class="o">,</span> 
         <span class="n">message</span> <span class="o">=</span> <span class="s">"must be the same as the Required Validator Field if specified"</span><span class="o">)</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="n">setFieldExpressionValidatorField</span><span class="o">(</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setFieldExpressionValidatorField</span><span class="o">(</span>
             <span class="n">String</span> <span class="n">fieldExpressionValidatorField</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">this</span><span class="o">.</span><span class="na">fieldExpressionValidatorField</span> <span class="o">=</span> <span class="n">fieldExpressionValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">String</span> <span class="n">getUrlValidatorField</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">getUrlValidatorField</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">urlValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
     <span class="nd">@UrlValidator</span><span class="o">(</span><span class="n">message</span><span class="o">=</span><span class="s">"must be a valid url if supplied"</span><span class="o">)</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="n">setUrlValidatorField</span><span class="o">(</span><span class="n">String</span> <span class="n">urlValidatorField</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setUrlValidatorField</span><span class="o">(</span><span class="n">String</span> <span class="n">urlValidatorField</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">this</span><span class="o">.</span><span class="na">urlValidatorField</span> <span class="o">=</span> <span class="n">urlValidatorField</span><span class="o">;</span>
     <span class="o">}</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p> </p>
 
@@ -260,7 +258,7 @@
 
 <p>Note that is is not necessary when using <em>Convention Plugin</em> .</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="cp">&lt;!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="cp">&lt;!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;</span>
 	
 <span class="nt">&lt;struts&gt;</span>
     <span class="nt">&lt;package&gt;</span>
@@ -271,8 +269,7 @@
          <span class="nt">&lt;/action&gt;</span>
     <span class="nt">&lt;/package&gt;</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <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 regular validatio [...]
 
@@ -343,9 +340,8 @@
   <p>theme.properties</p>
 </blockquote>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>parent = xhtml
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>parent = xhtml
+</code></pre></div></div>
 
 <p> </p>
 
@@ -474,15 +470,14 @@ ${parameters.labelseparator!":"?html}&lt;#t/&gt;
 
 <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>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nc">.ajaxVisualFeedback</span> <span class="p">{</span>
+<div class="language-css highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nc">.ajaxVisualFeedback</span> <span class="p">{</span>
     <span class="nl">width</span><span class="p">:</span> <span class="m">16px</span><span class="p">;</span>
     <span class="nl">height</span><span class="p">:</span> <span class="m">16px</span><span class="p">;</span>
     <span class="nl">background-image</span><span class="p">:</span> <span class="sx">url('../images/indicator.gif')</span><span class="p">;</span>
     <span class="nl">background-repeat</span><span class="p">:</span> <span class="nb">no-repeat</span><span class="p">;</span>
     <span class="nl">float</span><span class="p">:</span> <span class="nb">right</span><span class="p">;</span>
 <span class="p">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p> </p>
 
@@ -490,7 +485,7 @@ ${parameters.labelseparator!":"?html}&lt;#t/&gt;
 
 <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>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="cm">/**
+<div class="language-javascript highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="cm">/**
   * Validates form per AJAX. To be called as onSubmit handler.
   *
   * @param event onSubmit event
@@ -593,8 +588,7 @@ ${parameters.labelseparator!":"?html}&lt;#t/&gt;
 <span class="nx">$</span><span class="p">(</span><span class="nb">window</span><span class="p">).</span><span class="nx">bind</span><span class="p">(</span><span class="s1">'load'</span><span class="p">,</span> <span class="kd">function</span><span class="p">()</span> <span class="p">{</span>
     <span class="nx">$</span><span class="p">(</span><span class="s1">'form'</span><span class="p">).</span><span class="nx">bind</span><span class="p">(</span><span class="s1">'submit'</span><span class="p">,</span> <span class="nx">ajaxFormValidation</span><span class="p">);</span>
 <span class="p">});</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p> </p>
 
@@ -606,30 +600,27 @@ ${parameters.labelseparator!":"?html}&lt;#t/&gt;
 
 <p>When the <em>jsonValidation</em>  interceptor is invoked, it will look for a parameter named <em>struts.enableJSONValidation</em> , this parameter <strong>must</strong> be set to <em>true</em> , otherwise the interceptor won’t do anything. Then the interceptor will look for a parameter named <em>struts.validateOnly</em> , if this parameter exists, is set to <em>true</em> , and there are validation errors (o action errors) they will be serialized into JSON in the form:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
-    </span><span class="nt">"errors"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"Global Error 1"</span><span class="p">,</span><span class="w"> </span><span class="s2">"Global Error 2"</span><span class="p">],</span><span class="w">
-    </span><span class="nt">"fieldErrors"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nt">"field1"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"Field 1 Error 1"</span><span class="p">,</span><span class="w"> </span><span class="s2">"Field 1 Error 2"</span><span class="p">],</span><span class="w">
-        </span><span class="nt">"field1"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"Field 2 Error 1"</span><span class="p">,</span><span class="w"> </span><span class="s2">"Field 2 Error 2"</span><span class="p">]</span><span class="w">  
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
+    </span><span class="s2">"errors"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"Global Error 1"</span><span class="p">,</span><span class="w"> </span><span class="s2">"Global Error 2"</span><span class="p">],</span><span class="w">
+    </span><span class="s2">"fieldErrors"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="s2">"field1"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"Field 1 Error 1"</span><span class="p">,</span><span class="w"> </span><span class="s2">"Field 1 Error 2"</span><span class="p">],</span><span class="w">
+        </span><span class="s2">"field1"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"Field 2 Error 1"</span><span class="p">,</span><span class="w"> </span><span class="s2">"Field 2 Error 2"</span><span class="p">]</span><span class="w">  
     </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">
 
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <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 <em>struts.validateOnly</em>  is true), an empty JSON string will be returned:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{}</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{}</span><span class="w">
 
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <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>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="nt">"location"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;url to be loaded next&gt;"</span><span class="p">}</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="s2">"location"</span><span class="p">:</span><span class="w"> </span><span class="s2">"&lt;url to be loaded next&gt;"</span><span class="p">}</span><span class="w">
 
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <blockquote>
 
diff --git a/content/core-developers/ajax.html b/content/core-developers/ajax.html
index 6ef4f22..e831f41 100644
--- a/content/core-developers/ajax.html
+++ b/content/core-developers/ajax.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -145,13 +144,12 @@ or HTML, or plain text, another script, or whatever else the calling script may
 <p>Both Struts 1 and Struts 2 can return any type of response. We are not limited to forwarding to a server page. 
 In Struts 1, you can just do something like:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">response</span><span class="o">.</span><span class="na">setContentType</span><span class="o">(</span><span class="s">"text/html"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">response</span><span class="o">.</span><span class="na">setContentType</span><span class="o">(</span><span class="s">"text/html"</span><span class="o">);</span>
 <span class="n">PrintWriter</span> <span class="n">out</span> <span class="o">=</span> <span class="n">response</span><span class="o">.</span><span class="na">getWriter</span><span class="o">();</span>
 <span class="n">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"Hello World!  This is an AJAX response from a Struts Action."</span><span class="o">);</span>
 <span class="n">out</span><span class="o">.</span><span class="na">flush</span><span class="o">();</span>
 <span class="k">return</span> <span class="kc">null</span><span class="o">;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>In Struts 2, we can do the same thing with a Stream result.</p>
 
@@ -162,7 +160,7 @@ directly from within an action. See sections following this for further details.
 
 <p><strong>Struts 2 Stream result Action</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="kn">package</span> <span class="n">actions</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">package</span> <span class="n">actions</span><span class="o">;</span>
 
 <span class="kn">import</span> <span class="nn">java.io.InputStream</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">java.io.StringBufferInputStream</span><span class="o">;</span>
@@ -170,28 +168,26 @@ directly from within an action. See sections following this for further details.
 
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">TextResult</span> <span class="kd">extends</span> <span class="n">ActionSupport</span>  <span class="o">{</span>
     <span class="kd">private</span> <span class="n">InputStream</span> <span class="n">inputStream</span><span class="o">;</span>
-    <span class="kd">public</span> <span class="n">InputStream</span> <span class="n">getInputStream</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">InputStream</span> <span class="nf">getInputStream</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">inputStream</span><span class="o">;</span>
     <span class="o">}</span>
 
-    <span class="kd">public</span> <span class="n">String</span> <span class="n">execute</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">execute</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
         <span class="n">inputStream</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ByteArrayInputStream</span><span class="o">(</span><span class="s">"Hello World! This is a text string response from a Struts 2 Action."</span><span class="o">.</span><span class="na">getBytes</span><span class="o">(</span><span class="s">"UTF-8"</span><span class="o">));</span>
         <span class="k">return</span> <span class="n">SUCCESS</span><span class="o">;</span>
     <span class="o">}</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p><strong>Struts 2 Configuring the TextResult Action</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"text-result"</span> <span class="na">class=</span><span class="s">"actions.TextResult"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"text-result"</span> <span class="na">class=</span><span class="s">"actions.TextResult"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;result</span> <span class="na">type=</span><span class="s">"stream"</span><span class="nt">&gt;</span>
         <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"contentType"</span><span class="nt">&gt;</span>text/html<span class="nt">&lt;/param&gt;</span>
         <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"inputName"</span><span class="nt">&gt;</span>inputStream<span class="nt">&lt;/param&gt;</span>
     <span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <blockquote>
   <p>Struts 2 can also return a JSON (JavaScript Object Notation) response, using a <a href="http://cwiki.apache.org/S2PLUGINS/json-plugin.html">plugin</a>.</p>
diff --git a/content/core-developers/alias-interceptor.html b/content/core-developers/alias-interceptor.html
index ae9accd..efb3491 100644
--- a/content/core-developers/alias-interceptor.html
+++ b/content/core-developers/alias-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -151,7 +150,7 @@ is applied to has a setter named <code class="highlighter-rouge">alias1</code>,
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
      <span class="c">&lt;!-- The value for the foo parameter will be applied as if it were named bar --&gt;</span>
      <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"aliases"</span><span class="nt">&gt;</span>#{ 'foo' : 'bar' }<span class="nt">&lt;/param&gt;</span>
 
@@ -159,8 +158,7 @@ is applied to has a setter named <code class="highlighter-rouge">alias1</code>,
      <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"basicStack"</span><span class="nt">/&gt;</span>
      <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>good_result.ftl<span class="nt">&lt;/result&gt;</span>
  <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/annotation-parameter-filter-interceptor.html b/content/core-developers/annotation-parameter-filter-interceptor.html
index 054e97f..5f23a72 100644
--- a/content/core-developers/annotation-parameter-filter-interceptor.html
+++ b/content/core-developers/annotation-parameter-filter-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -150,13 +149,12 @@ and is marked with <code class="highlighter-rouge">Allowed</code>.</p>
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"exampleAction"</span> <span class="na">class=</span><span class="s">"com.examples.ExampleAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"exampleAction"</span> <span class="na">class=</span><span class="s">"com.examples.ExampleAction"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"annotationParameterFilter"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"defaultStack"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>example.jsp<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/annotation-workflow-interceptor.html b/content/core-developers/annotation-workflow-interceptor.html
index 85eebfb..f57a627 100644
--- a/content/core-developers/annotation-workflow-interceptor.html
+++ b/content/core-developers/annotation-workflow-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -147,11 +146,11 @@ class in the case of a <code class="highlighter-rouge">@Before</code> annotation
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>  <span class="kd">public</span> <span class="kd">class</span> <span class="nc">BaseAnnotatedAction</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="kd">public</span> <span class="kd">class</span> <span class="nc">BaseAnnotatedAction</span> <span class="o">{</span>
   	<span class="kd">protected</span> <span class="n">String</span> <span class="n">log</span> <span class="o">=</span> <span class="s">""</span><span class="o">;</span>
 
   	<span class="nd">@Before</span>
-  	<span class="kd">public</span> <span class="n">String</span> <span class="n">baseBefore</span><span class="o">()</span> <span class="o">{</span>
+  	<span class="kd">public</span> <span class="n">String</span> <span class="nf">baseBefore</span><span class="o">()</span> <span class="o">{</span>
   		<span class="n">log</span> <span class="o">=</span> <span class="n">log</span> <span class="o">+</span> <span class="s">"baseBefore-"</span><span class="o">;</span>
   		<span class="k">return</span> <span class="kc">null</span><span class="o">;</span>
   	<span class="o">}</span>
@@ -159,48 +158,45 @@ class in the case of a <code class="highlighter-rouge">@Before</code> annotation
 
   <span class="kd">public</span> <span class="kd">class</span> <span class="nc">AnnotatedAction</span> <span class="kd">extends</span> <span class="n">BaseAnnotatedAction</span> <span class="o">{</span>
   	<span class="nd">@Before</span>
-  	<span class="kd">public</span> <span class="n">String</span> <span class="n">before</span><span class="o">()</span> <span class="o">{</span>
+  	<span class="kd">public</span> <span class="n">String</span> <span class="nf">before</span><span class="o">()</span> <span class="o">{</span>
   		<span class="n">log</span> <span class="o">=</span> <span class="n">log</span> <span class="o">+</span> <span class="s">"before"</span><span class="o">;</span>
   		<span class="k">return</span> <span class="kc">null</span><span class="o">;</span>
   	<span class="o">}</span>
 
-  	<span class="kd">public</span> <span class="n">String</span> <span class="n">execute</span><span class="o">()</span> <span class="o">{</span>
+  	<span class="kd">public</span> <span class="n">String</span> <span class="nf">execute</span><span class="o">()</span> <span class="o">{</span>
   		<span class="n">log</span> <span class="o">=</span> <span class="n">log</span> <span class="o">+</span> <span class="s">"-execute"</span><span class="o">;</span>
   		<span class="k">return</span> <span class="n">Action</span><span class="o">.</span><span class="na">SUCCESS</span><span class="o">;</span>
   	<span class="o">}</span>
 
   	<span class="nd">@BeforeResult</span>
-  	<span class="kd">public</span> <span class="kt">void</span> <span class="n">beforeResult</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+  	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">beforeResult</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
   		<span class="n">log</span> <span class="o">=</span> <span class="n">log</span> <span class="o">+</span><span class="s">"-beforeResult"</span><span class="o">;</span>
   	<span class="o">}</span>
 
   	<span class="nd">@After</span>
-  	<span class="kd">public</span> <span class="kt">void</span> <span class="n">after</span><span class="o">()</span> <span class="o">{</span>
+  	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">after</span><span class="o">()</span> <span class="o">{</span>
   		<span class="n">log</span> <span class="o">=</span> <span class="n">log</span> <span class="o">+</span> <span class="s">"-after"</span><span class="o">;</span>
   	<span class="o">}</span>
   <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Configure a stack in struts.xml that replaces the PrepareInterceptor with the AnnotationWorkflowInterceptor:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;interceptor-stack</span> <span class="na">name=</span><span class="s">"annotatedStack"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;interceptor-stack</span> <span class="na">name=</span><span class="s">"annotatedStack"</span><span class="nt">&gt;</span>
 	<span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"static-params"</span><span class="nt">/&gt;</span>
 	<span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"params"</span><span class="nt">/&gt;</span>
 	<span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"conversionError"</span><span class="nt">/&gt;</span>
 	<span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"annotationWorkflow"</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;/interceptor-stack&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Given an Action, AnnotatedAction, add a reference to the AnnotationWorkflowInterceptor interceptor.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"AnnotatedAction"</span> <span class="na">class=</span><span class="s">"com.examples.AnnotatedAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"AnnotatedAction"</span> <span class="na">class=</span><span class="s">"com.examples.AnnotatedAction"</span><span class="nt">&gt;</span>
    <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"annotationWorkflow"</span><span class="nt">/&gt;</span>
    <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span> <span class="na">type=</span><span class="s">"freemarker"</span><span class="nt">&gt;</span>good_result.ftl<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>With the interceptor applied and the action executed on <code class="highlighter-rouge">AnnotatedAction</code> the log instance variable will contain 
 <code class="highlighter-rouge">baseBefore-before-execute-beforeResult-after</code>.</p>
diff --git a/content/core-developers/annotations.html b/content/core-developers/annotations.html
index bbc6c8b..a6d5e5a 100644
--- a/content/core-developers/annotations.html
+++ b/content/core-developers/annotations.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/core-developers/application-servers.html b/content/core-developers/application-servers.html
index b78c653..814300f 100644
--- a/content/core-developers/application-servers.html
+++ b/content/core-developers/application-servers.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/core-developers/basic-validation.html b/content/core-developers/basic-validation.html
index d0961db..68465d1 100644
--- a/content/core-developers/basic-validation.html
+++ b/content/core-developers/basic-validation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -136,7 +135,7 @@
 
 <p>Create the input form.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code>
 <span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;head&gt;</span>
 	<span class="nt">&lt;title&gt;</span>Struts2 Showcase - Validation - Basic<span class="nt">&lt;/title&gt;</span>
@@ -170,14 +169,13 @@
 <span class="nt">&lt;/body&gt;</span>
 <span class="nt">&lt;/html&gt;</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="step-2">Step 2</h2>
 
 <p>Create the Action class.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">QuizAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
 
 	<span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="kt">long</span> <span class="n">serialVersionUID</span> <span class="o">=</span> <span class="o">-</span><span class="mi">7505437345373234225L</span><span class="o">;</span>
@@ -186,40 +184,39 @@
 	<span class="kt">int</span> <span class="n">age</span><span class="o">;</span>
 	<span class="n">String</span> <span class="n">answer</span><span class="o">;</span>
 
-	<span class="kd">public</span> <span class="n">String</span> <span class="n">getName</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">String</span> <span class="nf">getName</span><span class="o">()</span> <span class="o">{</span>
 		<span class="k">return</span> <span class="n">name</span><span class="o">;</span>
 	<span class="o">}</span>
 
-	<span class="kd">public</span> <span class="kt">void</span> <span class="n">setName</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">setName</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
 		<span class="k">this</span><span class="o">.</span><span class="na">name</span> <span class="o">=</span> <span class="n">name</span><span class="o">;</span>
 	<span class="o">}</span>
 
-	<span class="kd">public</span> <span class="kt">int</span> <span class="n">getAge</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">int</span> <span class="nf">getAge</span><span class="o">()</span> <span class="o">{</span>
 		<span class="k">return</span> <span class="n">age</span><span class="o">;</span>
 	<span class="o">}</span>
 
-	<span class="kd">public</span> <span class="kt">void</span> <span class="n">setAge</span><span class="o">(</span><span class="kt">int</span> <span class="n">age</span><span class="o">)</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">setAge</span><span class="o">(</span><span class="kt">int</span> <span class="n">age</span><span class="o">)</span> <span class="o">{</span>
 		<span class="k">this</span><span class="o">.</span><span class="na">age</span> <span class="o">=</span> <span class="n">age</span><span class="o">;</span>
 	<span class="o">}</span>
 
-	<span class="kd">public</span> <span class="n">String</span> <span class="n">getAnswer</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">String</span> <span class="nf">getAnswer</span><span class="o">()</span> <span class="o">{</span>
 		<span class="k">return</span> <span class="n">answer</span><span class="o">;</span>
 	<span class="o">}</span>
 
-	<span class="kd">public</span> <span class="kt">void</span> <span class="n">setAnswer</span><span class="o">(</span><span class="n">String</span> <span class="n">answer</span><span class="o">)</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">setAnswer</span><span class="o">(</span><span class="n">String</span> <span class="n">answer</span><span class="o">)</span> <span class="o">{</span>
 		<span class="k">this</span><span class="o">.</span><span class="na">answer</span> <span class="o">=</span> <span class="n">answer</span><span class="o">;</span>
 	<span class="o">}</span>
 <span class="o">}</span>
 
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="step-3">Step 3</h2>
 
 <p>Create the validators. The <code class="highlighter-rouge">validation.xml</code> format is either <code class="highlighter-rouge">&lt;ActionClassName&gt;-validation.xml</code> or <code class="highlighter-rouge">&lt;ActionClassName&gt;-&lt;ActionAliasName&gt;-validation.xml</code>.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="c">&lt;!--
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c">&lt;!--
     Add the following DOCTYPE declaration as first line of your XXX-validation.xml file:
     &lt;!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd"&gt;
 --&gt;</span>
@@ -239,21 +236,19 @@
 <span class="nt">&lt;/validators&gt;</span>
 
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="step-4">Step 4</h2>
 
 <p>Make sure there is a result for “input” listed in the struts.xml for when the validation fails:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"HelloWorld"</span> <span class="na">class=</span><span class="s">"tutorial.HelloWorld"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"HelloWorld"</span> <span class="na">class=</span><span class="s">"tutorial.HelloWorld"</span><span class="nt">&gt;</span>
 <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>/tutorial/createconfirm.jsp<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"error"</span><span class="nt">&gt;</span>/tutorial/error.jsp<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"input"</span><span class="nt">&gt;</span>/tutorial/create.jsp<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <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>
 
diff --git a/content/core-developers/bean-configuration.html b/content/core-developers/bean-configuration.html
index e066867..b90bb74 100644
--- a/content/core-developers/bean-configuration.html
+++ b/content/core-developers/bean-configuration.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -199,14 +198,13 @@ constants. Objects using value inject must define the <code class="highlighter-r
 
 <p><strong>Bean Example (struts.xml)</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;struts&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;struts&gt;</span>
 
   <span class="nt">&lt;bean</span> <span class="na">type=</span><span class="s">"com.opensymphony.xwork2.ObjectFactory"</span> <span class="na">name=</span><span class="s">"myfactory"</span> <span class="na">class=</span><span class="s">"com.company.myapp.MyObjectFactory"</span> <span class="nt">/&gt;</span>
   ... 
 
 <span class="nt">&lt;/struts&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/before-annotation.html b/content/core-developers/before-annotation.html
index e30c4e8..e449c3c 100644
--- a/content/core-developers/before-annotation.html
+++ b/content/core-developers/before-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -146,20 +145,19 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">SampleAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">SampleAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
 
   <span class="nd">@Before</span>
-  <span class="kd">public</span> <span class="kt">void</span> <span class="n">isAuthorized</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">AuthenticationException</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="kt">void</span> <span class="nf">isAuthorized</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">AuthenticationException</span> <span class="o">{</span>
     <span class="c1">// authorize request, throw exception if failed</span>
   <span class="o">}</span>
 
-  <span class="kd">public</span> <span class="n">String</span> <span class="n">execute</span><span class="o">()</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="n">String</span> <span class="nf">execute</span><span class="o">()</span> <span class="o">{</span>
      <span class="c1">// perform secure action</span>
      <span class="k">return</span> <span class="n">SUCCESS</span><span class="o">;</span>
   <span class="o">}</span>
  <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/before-result-annotation.html b/content/core-developers/before-result-annotation.html
index f97a20c..b0b5c3f 100644
--- a/content/core-developers/before-result-annotation.html
+++ b/content/core-developers/before-result-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -146,20 +145,19 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">SampleAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">SampleAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
 
   <span class="nd">@BeforeResult</span>
-  <span class="kd">public</span> <span class="kt">void</span> <span class="n">isValid</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">ValidationException</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="kt">void</span> <span class="nf">isValid</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">ValidationException</span> <span class="o">{</span>
     <span class="c1">// validate model object, throw exception if failed</span>
   <span class="o">}</span>
 
-  <span class="kd">public</span> <span class="n">String</span> <span class="n">execute</span><span class="o">()</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="n">String</span> <span class="nf">execute</span><span class="o">()</span> <span class="o">{</span>
      <span class="c1">// perform action</span>
      <span class="k">return</span> <span class="n">SUCCESS</span><span class="o">;</span>
   <span class="o">}</span>
  <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/big-picture.html b/content/core-developers/big-picture.html
index b522d82..ef2f5f0 100644
--- a/content/core-developers/big-picture.html
+++ b/content/core-developers/big-picture.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/core-developers/chain-result.html b/content/core-developers/chain-result.html
index 8ff7f1d..e31f739 100644
--- a/content/core-developers/chain-result.html
+++ b/content/core-developers/chain-result.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -145,7 +144,7 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"public"</span> <span class="na">extends=</span><span class="s">"struts-default"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"public"</span> <span class="na">extends=</span><span class="s">"struts-default"</span><span class="nt">&gt;</span>
     <span class="c">&lt;!-- Chain creatAccount to login, using the default parameter --&gt;</span>
     <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"createAccount"</span> <span class="na">class=</span><span class="s">"..."</span><span class="nt">&gt;</span>
         <span class="nt">&lt;result</span> <span class="na">type=</span><span class="s">"chain"</span><span class="nt">&gt;</span>login<span class="nt">&lt;/result&gt;</span>
@@ -165,8 +164,7 @@
         <span class="nt">&lt;result&gt;</span>dashboard.jsp<span class="nt">&lt;/result&gt;</span>
     <span class="nt">&lt;/action&gt;</span>
 <span class="nt">&lt;/package&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/chaining-interceptor.html b/content/core-developers/chaining-interceptor.html
index 29ba56d..a76464b 100644
--- a/content/core-developers/chaining-interceptor.html
+++ b/content/core-developers/chaining-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -143,11 +142,13 @@ for more information.</p>
 
 <blockquote>
   <p>It is important to remember that this interceptor does nothing if there are no objects already on the stack. 
-This means two things:
-1. you can safely apply it to all your actions without any worry of adverse affects.
-2. it is up to you to ensure an object exists in the stack prior to invoking this action. The most typical way this 
+This means two things:</p>
+  <ol>
+    <li>you can safely apply it to all your actions without any worry of adverse affects.</li>
+    <li>it is up to you to ensure an object exists in the stack prior to invoking this action. The most typical way this 
   is done is through the use of the <b>chain</b> result type, which combines with this interceptor to make up the action 
-  chaining feature.</p>
+  chaining feature.</li>
+  </ol>
 </blockquote>
 
 <p>By default Errors, Field errors and Message aren’t copied during chaining, to change the behaviour you can specify 
@@ -161,9 +162,8 @@ the below three constants in struts.properties or struts.xml:</p>
 
 <h3 id="example">Example</h3>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.xwork.chaining.copyErrors"</span> <span class="na">value=</span><span class="s">"true"</span><span class="nt">/&gt;</span>
-</code></pre>
-</div>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.xwork.chaining.copyErrors"</span> <span class="na">value=</span><span class="s">"true"</span><span class="nt">/&gt;</span>
+</code></pre></div></div>
 
 <h2 id="parameters">Parameters</h2>
 
@@ -180,7 +180,7 @@ the below three constants in struts.properties or struts.xml:</p>
 
 <p>Simple example how to chain two actions</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"basicStack"</span><span class="nt">/&gt;</span>
 	<span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span> <span class="na">type=</span><span class="s">"chain"</span><span class="nt">&gt;</span>otherAction<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
@@ -190,12 +190,11 @@ the below three constants in struts.properties or struts.xml:</p>
 	<span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"basicStack"</span><span class="nt">/&gt;</span>
 	<span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>good_result.ftl<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>This examples chains two actions but only one property from first action is copied to another</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"basicStack"</span><span class="nt">/&gt;</span>
 	<span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span> <span class="na">type=</span><span class="s">"chain"</span><span class="nt">&gt;</span>otherAction<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
@@ -206,8 +205,7 @@ the below three constants in struts.properties or struts.xml:</p>
 	<span class="nt">&lt;/interceptor-ref&gt;</span>
 	<span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>good_result.ftl<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/checkbox-interceptor.html b/content/core-developers/checkbox-interceptor.html
index 65e042d..5a6df19 100644
--- a/content/core-developers/checkbox-interceptor.html
+++ b/content/core-developers/checkbox-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/core-developers/clear-session-interceptor.html b/content/core-developers/clear-session-interceptor.html
index fd19519..04838a8 100644
--- a/content/core-developers/clear-session-interceptor.html
+++ b/content/core-developers/clear-session-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -144,13 +143,12 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"exampleAction"</span> <span class="na">class=</span><span class="s">"com.examples.ExampleAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"exampleAction"</span> <span class="na">class=</span><span class="s">"com.examples.ExampleAction"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"clearSession"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"defaultStack"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>example.jsp<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/client-side-validation.html b/content/core-developers/client-side-validation.html
index 17a9cd0..7efd413 100644
--- a/content/core-developers/client-side-validation.html
+++ b/content/core-developers/client-side-validation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/core-developers/client-validation.html b/content/core-developers/client-validation.html
index 65e758f..9b18d67 100644
--- a/content/core-developers/client-validation.html
+++ b/content/core-developers/client-validation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -140,7 +139,7 @@
 
 <p>Create the form.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code>
 <span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;head&gt;</span>
 	<span class="nt">&lt;title&gt;</span>Struts2 Showcase - Validation - Basic<span class="nt">&lt;/title&gt;</span>
@@ -171,8 +170,7 @@
 <span class="nt">&lt;/html&gt;</span>
 
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>(information) This case uses the default xhtml theme, so the <code class="highlighter-rouge">&lt;s:head &gt;</code> tag is used to link a style sheet.</p>
 
@@ -180,7 +178,7 @@
 
 <p>Create the Action class.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">QuizAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
 
 	<span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="kt">long</span> <span class="n">serialVersionUID</span> <span class="o">=</span> <span class="o">-</span><span class="mi">7505437345373234225L</span><span class="o">;</span>
@@ -189,40 +187,39 @@
 	<span class="kt">int</span> <span class="n">age</span><span class="o">;</span>
 	<span class="n">String</span> <span class="n">answer</span><span class="o">;</span>
 
-	<span class="kd">public</span> <span class="n">String</span> <span class="n">getName</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">String</span> <span class="nf">getName</span><span class="o">()</span> <span class="o">{</span>
 		<span class="k">return</span> <span class="n">name</span><span class="o">;</span>
 	<span class="o">}</span>
 
-	<span class="kd">public</span> <span class="kt">void</span> <span class="n">setName</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">setName</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">)</span> <span class="o">{</span>
 		<span class="k">this</span><span class="o">.</span><span class="na">name</span> <span class="o">=</span> <span class="n">name</span><span class="o">;</span>
 	<span class="o">}</span>
 
-	<span class="kd">public</span> <span class="kt">int</span> <span class="n">getAge</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">int</span> <span class="nf">getAge</span><span class="o">()</span> <span class="o">{</span>
 		<span class="k">return</span> <span class="n">age</span><span class="o">;</span>
 	<span class="o">}</span>
 
-	<span class="kd">public</span> <span class="kt">void</span> <span class="n">setAge</span><span class="o">(</span><span class="kt">int</span> <span class="n">age</span><span class="o">)</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">setAge</span><span class="o">(</span><span class="kt">int</span> <span class="n">age</span><span class="o">)</span> <span class="o">{</span>
 		<span class="k">this</span><span class="o">.</span><span class="na">age</span> <span class="o">=</span> <span class="n">age</span><span class="o">;</span>
 	<span class="o">}</span>
 
-	<span class="kd">public</span> <span class="n">String</span> <span class="n">getAnswer</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">String</span> <span class="nf">getAnswer</span><span class="o">()</span> <span class="o">{</span>
 		<span class="k">return</span> <span class="n">answer</span><span class="o">;</span>
 	<span class="o">}</span>
 
-	<span class="kd">public</span> <span class="kt">void</span> <span class="n">setAnswer</span><span class="o">(</span><span class="n">String</span> <span class="n">answer</span><span class="o">)</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">setAnswer</span><span class="o">(</span><span class="n">String</span> <span class="n">answer</span><span class="o">)</span> <span class="o">{</span>
 		<span class="k">this</span><span class="o">.</span><span class="na">answer</span> <span class="o">=</span> <span class="n">answer</span><span class="o">;</span>
 	<span class="o">}</span>
 <span class="o">}</span>
 
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p><strong>Step 3</strong></p>
 
 <p>Create the <code class="highlighter-rouge">validation.xml</code> to configure the validators to be used.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="c">&lt;!--
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c">&lt;!--
     Add the following DOCTYPE declaration as first line of your XXX-validation.xml file:
     &lt;!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd"&gt;
 --&gt;</span>
@@ -242,8 +239,7 @@
 <span class="nt">&lt;/validators&gt;</span>
 
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p><strong>Action and Namespace</strong></p>
 
diff --git a/content/core-developers/conditionalvisitor-validator.html b/content/core-developers/conditionalvisitor-validator.html
index e5a72f1..fe03ffc 100644
--- a/content/core-developers/conditionalvisitor-validator.html
+++ b/content/core-developers/conditionalvisitor-validator.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -142,14 +141,13 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;field name="colleaguePosition"&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;field name="colleaguePosition"&gt;
     &lt;field-validator type="conditionalvisitor"&gt;
         &lt;param name="expression"&gt;reason == 'colleague' and colleaguePositionID == 'OTHER'&lt;/param&gt;
         &lt;message&gt;You must select reason Colleague and position Other&lt;/message&gt;
     &lt;/field-validator&gt;
 &lt;/field&gt;
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/configuration-elements.html b/content/core-developers/configuration-elements.html
index 5ba9deb..e098407 100644
--- a/content/core-developers/configuration-elements.html
+++ b/content/core-developers/configuration-elements.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -133,10 +132,12 @@
 <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 class="highlighter-rouge">web.xml</code>.</p>
 
-<p>Likewise, the framework uses a configuration file to initialize its own resources. These resources include:
-- <em>Interceptors</em> that can preprocess and postprocess a request
-- <em>Action classes</em> that can call business logic and data access code
-- <em>Results</em> that can prepare views, like JavaServer Pages and FreeMarker templates</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 class="highlighter-rouge">struts.xml</code> document. There are several elements that can be configured, 
diff --git a/content/core-developers/configuration-files.html b/content/core-developers/configuration-files.html
index 971a44b..f4642c8 100644
--- a/content/core-developers/configuration-files.html
+++ b/content/core-developers/configuration-files.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/core-developers/configuration-provider-and-configuration.html b/content/core-developers/configuration-provider-and-configuration.html
index 614d003..6cf8232 100644
--- a/content/core-developers/configuration-provider-and-configuration.html
+++ b/content/core-developers/configuration-provider-and-configuration.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -134,10 +133,10 @@
 
 <h2 id="example">Example</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="kd">static</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">static</span> <span class="o">{</span>
    <span class="n">Dispatcher</span><span class="o">.</span><span class="na">addDispatcherListener</span><span class="o">(</span><span class="k">new</span> <span class="n">DispatcherListener</span><span class="o">()</span> <span class="o">{</span>
      <span class="o">....</span>
-     <span class="kd">public</span> <span class="kt">void</span> <span class="n">dispatcherInitialized</span><span class="o">(</span><span class="n">Dispatcher</span> <span class="n">du</span><span class="o">)</span> <span class="o">{</span>
+     <span class="kd">public</span> <span class="kt">void</span> <span class="nf">dispatcherInitialized</span><span class="o">(</span><span class="n">Dispatcher</span> <span class="n">du</span><span class="o">)</span> <span class="o">{</span>
          <span class="n">ConfigurationManager</span> <span class="n">confManager</span> <span class="o">=</span> <span class="n">du</span><span class="o">.</span><span class="na">getConfigurationManager</span><span class="o">();</span>
          <span class="n">confManager</span><span class="o">.</span><span class="na">addConfigurationProvider</span><span class="o">(</span> <span class="o">...</span> <span class="o">);</span>
      <span class="o">}</span>
@@ -145,8 +144,7 @@
    <span class="o">});</span>
  <span class="o">}</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="configuration-provider">Configuration provider</h2>
 
diff --git a/content/core-developers/constant-configuration.html b/content/core-developers/constant-configuration.html
index 1e59e7d..4a20af2 100644
--- a/content/core-developers/constant-configuration.html
+++ b/content/core-developers/constant-configuration.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -185,13 +184,12 @@ for subsequent files to override previous ones:</p>
 <p>Since Apache Struts 2.5.6 it is possible to use value substitution when defining <code class="highlighter-rouge">constant</code>s in <code class="highlighter-rouge">struts.xml</code> file. 
 You can also define a default value if given System property or ENV variable is missing, see example below:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;struts&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;struts&gt;</span>
     <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"os"</span> <span class="na">value=</span><span class="s">"Current OS = ${os.name}"</span><span class="nt">/&gt;</span>
 
     <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.devMode"</span> <span class="na">value=</span><span class="s">"${env.STRUTS_DEV_MODE:false}"</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;/struts&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Note: substitution is limited to System properties and ENV variables and works only for <code class="highlighter-rouge">constant</code>s (as for now).</p>
 
@@ -199,24 +197,22 @@ You can also define a default value if given System property or ENV variable is
 
 <p><strong>Constant Example (struts.xml)</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;struts&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;struts&gt;</span>
 
   <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.devMode"</span> <span class="na">value=</span><span class="s">"true"</span> <span class="nt">/&gt;</span>
   ... 
 
 <span class="nt">&lt;/struts&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p><strong>Constant Example (struts.properties)</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>struts.devMode = true
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>struts.devMode = true
+</code></pre></div></div>
 
 <p><strong>Constant Example (web.xml)</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;web-app</span> <span class="na">id=</span><span class="s">"WebApp_9"</span> <span class="na">version=</span><span class="s">"2.4"</span> 
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;web-app</span> <span class="na">id=</span><span class="s">"WebApp_9"</span> <span class="na">version=</span><span class="s">"2.4"</span> 
 	<span class="na">xmlns=</span><span class="s">"http://java.sun.com/xml/ns/j2ee"</span> 
 	<span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span> 
 	<span class="na">xsi:schemaLocation=</span><span class="s">"http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"</span><span class="nt">&gt;</span>
@@ -233,8 +229,7 @@ You can also define a default value if given System property or ENV variable is
     ...
 
 <span class="nt">&lt;/web-app&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/conversion-annotation.html b/content/core-developers/conversion-annotation.html
index 3a886d5..dddf553 100644
--- a/content/core-developers/conversion-annotation.html
+++ b/content/core-developers/conversion-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -162,7 +161,7 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nd">@Conversion</span><span class="o">(</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@Conversion</span><span class="o">(</span>
      <span class="n">conversions</span> <span class="o">=</span> <span class="o">{</span>
           <span class="c1">// key must be the name of a property for which converter should be used</span>
           <span class="nd">@TypeConversion</span><span class="o">(</span><span class="n">key</span> <span class="o">=</span> <span class="s">"date"</span><span class="o">,</span> <span class="n">converter</span> <span class="o">=</span> <span class="s">"org.demo.converter.DateConverter"</span><span class="o">)</span>
@@ -172,17 +171,16 @@
 
      <span class="kd">private</span> <span class="n">Date</span> <span class="n">date</span><span class="o">;</span>
 
-     <span class="kd">public</span> <span class="n">setDate</span><span class="o">(</span><span class="n">Date</span> <span class="n">date</span><span class="o">)</span> <span class="o">{</span>
+     <span class="kd">public</span> <span class="nf">setDate</span><span class="o">(</span><span class="n">Date</span> <span class="n">date</span><span class="o">)</span> <span class="o">{</span>
          <span class="k">this</span><span class="o">.</span><span class="na">date</span> <span class="o">=</span> <span class="n">date</span><span class="o">;</span>
      <span class="o">}</span>
 
-     <span class="kd">public</span> <span class="n">Date</span> <span class="n">getDate</span><span class="o">()</span> <span class="o">{</span>
+     <span class="kd">public</span> <span class="n">Date</span> <span class="nf">getDate</span><span class="o">()</span> <span class="o">{</span>
          <span class="k">return</span> <span class="n">date</span><span class="o">;</span>
      <span class="o">}</span>
 
  <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Check also <a href="type-conversion-annotation.html">TypeConversion Annotation</a> for more examples!</p>
 
diff --git a/content/core-developers/conversion-error-field-validator-annotation.html b/content/core-developers/conversion-error-field-validator-annotation.html
index 58c0bd0..906f13a 100644
--- a/content/core-developers/conversion-error-field-validator-annotation.html
+++ b/content/core-developers/conversion-error-field-validator-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -189,9 +188,8 @@ See <a href="type-conversion.html#type-conversion-error-handling">Type Conversio
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nd">@ConversionErrorFieldValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span><span class="o">)</span>
-</code></pre>
-</div>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@ConversionErrorFieldValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</s [...]
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/conversion-error-interceptor.html b/content/core-developers/conversion-error-interceptor.html
index 5ad1b74..51576f9 100644
--- a/content/core-developers/conversion-error-interceptor.html
+++ b/content/core-developers/conversion-error-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -147,7 +146,7 @@ examples on how to use this feature.</p>
 </blockquote>
 
 <p>This interceptor extends <code class="highlighter-rouge">ConversionErrorInterceptor</code> but only adds conversion errors from the ActionContext to the field 
-errors of the action if the field value is not null, <code class="highlighter-rouge">""</code>, or <code class="highlighter-rouge"><span class="p">{</span><span class="nt">""</span><span class="err">}</span></code> (a size 1 String array with only an empty String). 
+errors of the action if the field value is not null, <code class="highlighter-rouge">""</code>, or <code class="highlighter-rouge">{""}</code> (a size 1 String array with only an empty String). 
 See <code class="highlighter-rouge">ConversionErrorInterceptor</code> for more information, as well as the Type Conversion documentation.</p>
 
 <h2 id="parameters">Parameters</h2>
@@ -160,13 +159,12 @@ See <code class="highlighter-rouge">ConversionErrorInterceptor</code> for more i
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
      <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"params"</span><span class="nt">/&gt;</span>
      <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"conversionError"</span><span class="nt">/&gt;</span>
      <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>good_result.ftl<span class="nt">&lt;/result&gt;</span>
  <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/conversion-validator.html b/content/core-developers/conversion-validator.html
index 4a1c72a..a82d75c 100644
--- a/content/core-developers/conversion-validator.html
+++ b/content/core-developers/conversion-validator.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -142,7 +141,7 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;!-- Plain Validator Syntax --&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;!-- Plain Validator Syntax --&gt;
 &lt;validator type="conversion"&gt;
         &lt;param name="fieldName"&gt;myField&lt;/param&gt;
      &lt;message&gt;Conversion Error Occurred&lt;/message&gt;
@@ -154,8 +153,7 @@
       &lt;message&gt;Conversion Error Occurred&lt;/message&gt;
    &lt;/field-validator&gt;
 &lt;/field&gt;
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="repopulating-field-upon-conversion-error">Repopulating Field upon conversion Error</h2>
 
@@ -163,17 +161,16 @@
 
 <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 <code class="highlighter-rouge">repopulateField</code> property set to true, it will, meaning the textfield will have ‘one’ as its value upon conver [...]
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;!-- myJspPage.jsp --&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;!-- myJspPage.jsp --&gt;
 &lt;s:form action="someAction" method="POST"&gt;
   ....
   &lt;s:textfield label="My Integer Field" name="myIntegerField" /&gt;
   ....
   &lt;s:submit /&gt;
 &lt;/s:form&gt;
-</code></pre>
-</div>
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;!-- xwork.xml --&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;!-- xwork.xml --&gt;
 &lt;xwork&gt;
 &lt;include file="xwork-default.xml" /&gt;
 ....
@@ -187,10 +184,9 @@
 &lt;/package&gt;
 ....
 &lt;/xwork&gt;
-</code></pre>
-</div>
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;!-- MyActionSupport.java --&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;!-- MyActionSupport.java --&gt;
 public class MyActionSupport extends ActionSupport {
    private Integer myIntegerField;
  
@@ -199,10 +195,9 @@ public class MyActionSupport extends ActionSupport {
       this.myIntegerField = myIntegerField;
    }
 }
-</code></pre>
-</div>
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;!-- MyActionSupport-someAction-validation.xml --&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;!-- MyActionSupport-someAction-validation.xml --&gt;
 &lt;validators&gt;
   ...
   &lt;field name="myIntegerField"&gt;
@@ -213,8 +208,7 @@ public class MyActionSupport extends ActionSupport {
   &lt;/field&gt;
   ...
 &lt;/validators&gt;
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/cookie-interceptor.html b/content/core-developers/cookie-interceptor.html
index b80b4a6..ff70732 100644
--- a/content/core-developers/cookie-interceptor.html
+++ b/content/core-developers/cookie-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -171,7 +170,7 @@ that implements <code class="highlighter-rouge">CookiesAware</code>.</li>
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="c">&lt;!--
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="c">&lt;!--
    This example will inject cookies named either 'cookie1' or 'cookie2' whose
    value could be either 'cookie1value' or 'cookie2value' into Struts' action.
  --&gt;</span>
@@ -224,8 +223,7 @@ that implements <code class="highlighter-rouge">CookiesAware</code>.</li>
     ...
  <span class="nt">&lt;/action&gt;</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/cookie-provider-interceptor.html b/content/core-developers/cookie-provider-interceptor.html
index ba6dd52..ff0ef0b 100644
--- a/content/core-developers/cookie-provider-interceptor.html
+++ b/content/core-developers/cookie-provider-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -149,14 +148,13 @@ interceptor in your default stack or in action’s stack, see example below.</p>
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="err">...</span> <span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="err">...</span> <span class="nt">&gt;</span>
    <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"defaultStack"</span><span class="nt">/&gt;</span>
    <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"cookieProvider"</span><span class="nt">/&gt;</span>
    ...
  <span class="nt">&lt;/action&gt;</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/create-if-null-annotation.html b/content/core-developers/create-if-null-annotation.html
index 039bad6..44c0b49 100644
--- a/content/core-developers/create-if-null-annotation.html
+++ b/content/core-developers/create-if-null-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -162,11 +161,10 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nd">@CreateIfNull</span><span class="o">(</span> <span class="n">value</span> <span class="o">=</span> <span class="kc">true</span> <span class="o">)</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@CreateIfNull</span><span class="o">(</span> <span class="n">value</span> <span class="o">=</span> <span class="kc">true</span> <span class="o">)</span>
  <span class="kd">private</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">User</span><span class="o">&gt;</span> <span class="n">users</span><span class="o">;</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/create-session-interceptor.html b/content/core-developers/create-session-interceptor.html
index 0fd7377..3b5cf42 100644
--- a/content/core-developers/create-session-interceptor.html
+++ b/content/core-developers/create-session-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -147,13 +146,12 @@ a HttpSession is already created since freemarker commits the response to the cl
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
      <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"createSession"</span><span class="nt">/&gt;</span>
      <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"defaultStack"</span><span class="nt">/&gt;</span>
      <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"input"</span><span class="nt">&gt;</span>input_with_token_tag.ftl<span class="nt">&lt;/result&gt;</span>
  <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/custom-validator-annotation.html b/content/core-developers/custom-validator-annotation.html
index c8813b4..5f044e0 100644
--- a/content/core-developers/custom-validator-annotation.html
+++ b/content/core-developers/custom-validator-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -188,9 +187,8 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nd">@CustomValidator</span><span class="o">(</span><span class="n">type</span> <span class="o">=</span><span class="s">"customValidatorName"</span><span class="o">,</span> <span class="n">fieldName</span> <span class="o">=</span> <span class="s">"myField"</span><span class="o">)</span>
-</code></pre>
-</div>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@CustomValidator</span><span class="o">(</span><span class="n">type</span> <span class="o">=</span><span class="s">"customValidatorName"</span><span class="o">,</span> <span class="n">fieldName</span> <span class="o">=</span> <span class="s">"myField"</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h2 id="adding-parameters">Adding Parameters</h2>
 
diff --git a/content/core-developers/date-range-field-validator-annotation.html b/content/core-developers/date-range-field-validator-annotation.html
index 2a92610..40aaf19 100644
--- a/content/core-developers/date-range-field-validator-annotation.html
+++ b/content/core-developers/date-range-field-validator-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -226,9 +225,8 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nd">@DateRangeFieldValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span><span class="o">,</span> <span class="n [...]
-</code></pre>
-</div>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@DateRangeFieldValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span><s [...]
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/date-validator.html b/content/core-developers/date-validator.html
index 346bd7a..4723bbf 100644
--- a/content/core-developers/date-validator.html
+++ b/content/core-developers/date-validator.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -156,7 +155,7 @@ Do not use <code class="highlighter-rouge">${minExpression}</code> and <code cla
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;validators&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;validators&gt;
     &lt;!-- Plain Validator syntax --&gt;
     &lt;validator type="date"&gt;
         &lt;param name="fieldName"&gt;birthday&lt;/param&gt;
@@ -183,8 +182,7 @@ Do not use <code class="highlighter-rouge">${minExpression}</code> and <code cla
         &lt;/field-validator&gt;
     &lt;/field&gt;
 &lt;/validators&gt;
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/debugging-interceptor.html b/content/core-developers/debugging-interceptor.html
index 39a4441..9dc45bf 100644
--- a/content/core-developers/debugging-interceptor.html
+++ b/content/core-developers/debugging-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/core-developers/debugging.html b/content/core-developers/debugging.html
index c82d82d..cf09f83 100644
--- a/content/core-developers/debugging.html
+++ b/content/core-developers/debugging.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -141,13 +140,12 @@ display objects from the Value Stack.</p>
 <p>To use the debugging, first be sure that <code class="highlighter-rouge">struts.devMode</code> is set to <code class="highlighter-rouge">true</code> is enabled through 
 the <a href="struts-properties.html">struts.properties</a> file or <code class="highlighter-rouge">struts.xml</code> file, like:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.devMode"</span> <span class="na">value=</span><span class="s">"true"</span> <span class="nt">/&gt;</span>
-</code></pre>
-</div>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.devMode"</span> <span class="na">value=</span><span class="s">"true"</span> <span class="nt">/&gt;</span>
+</code></pre></div></div>
 
 <p>Then, whenever a page needs debugging, add <code class="highlighter-rouge">?debug=xml</code> or <code class="highlighter-rouge">?debug=console</code> or <code class="highlighter-rouge">?debug=browser</code> to the URL.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;debug&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;debug&gt;</span>
      <span class="nt">&lt;parameters</span> <span class="nt">/&gt;</span> 
      <span class="nt">&lt;context&gt;</span>
         <span class="nt">&lt;struts.actionMapping&gt;</span>
@@ -187,8 +185,7 @@ the <a href="struts-properties.html">struts.properties</a> file or <code class="
         <span class="nt">&lt;/value&gt;</span>
     <span class="nt">&lt;/valueStack&gt;</span>
 <span class="nt">&lt;/debug&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>For <code class="highlighter-rouge">?debug=xml</code> use Internet Explorer or an <a href="http://ietab.mozdev.org/">IE tab in FireFox</a>.</p>
 
diff --git a/content/core-developers/default-properties.html b/content/core-developers/default-properties.html
index 7c1eb9c..fd6b3ac 100644
--- a/content/core-developers/default-properties.html
+++ b/content/core-developers/default-properties.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/core-developers/default-workflow-interceptor.html b/content/core-developers/default-workflow-interceptor.html
index 11a2a3f..8394837 100644
--- a/content/core-developers/default-workflow-interceptor.html
+++ b/content/core-developers/default-workflow-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -149,18 +148,22 @@ method names and/or a list of included method names, whereby <code class="highli
 sign is interpreted as wildcard matching all methods for both parameters. <code class="highlighter-rouge">MethodFilterInterceptor</code> for more info.</p>
 </blockquote>
 
-<p>This interceptor also supports the following interfaces which can implemented by actions:
- - <code class="highlighter-rouge">ValidationAware</code> - implemented by ActionSupport class
- - <code class="highlighter-rouge">ValidationWorkflowAware</code> - allows changing result name programmatically
- - <code class="highlighter-rouge">ValidationErrorAware</code> - notifies action about errors and also allow change result name</p>
+<p>This interceptor also supports the following interfaces which can implemented by actions:</p>
+<ul>
+  <li><code class="highlighter-rouge">ValidationAware</code> - implemented by ActionSupport class</li>
+  <li><code class="highlighter-rouge">ValidationWorkflowAware</code> - allows changing result name programmatically</li>
+  <li><code class="highlighter-rouge">ValidationErrorAware</code> - notifies action about errors and also allow change result name</li>
+</ul>
 
 <p>You can also use <code class="highlighter-rouge">InputConfig</code> annotation to change result name returned when validation errors occurred.</p>
 
-<p>In <code class="highlighter-rouge">DefaultWorkflowInterceptor</code> applies only when action implements <code class="highlighter-rouge">com.opensymphony.xwork2.Validateable</code>
- 1. if the action class have <code class="highlighter-rouge">validate{MethodName}()</code>, it will be invoked
- 2. else if the action class have <code class="highlighter-rouge">validateDo{MethodName}()</code>, it will be invoked
- 3. no matter if 1] or 2] is performed, if <code class="highlighter-rouge">alwaysInvokeValidate</code> property of the interceptor is <code class="highlighter-rouge">true</code> (which is by 
-   default <code class="highlighter-rouge">true</code>), <code class="highlighter-rouge">validate()</code> will be invoked.</p>
+<p>In <code class="highlighter-rouge">DefaultWorkflowInterceptor</code> applies only when action implements <code class="highlighter-rouge">com.opensymphony.xwork2.Validateable</code></p>
+<ol>
+  <li>if the action class have <code class="highlighter-rouge">validate{MethodName}()</code>, it will be invoked</li>
+  <li>else if the action class have <code class="highlighter-rouge">validateDo{MethodName}()</code>, it will be invoked</li>
+  <li>no matter if 1] or 2] is performed, if <code class="highlighter-rouge">alwaysInvokeValidate</code> property of the interceptor is <code class="highlighter-rouge">true</code> (which is by 
+   default <code class="highlighter-rouge">true</code>), <code class="highlighter-rouge">validate()</code> will be invoked.</li>
+</ol>
 
 <h2 id="parameters">Parameters</h2>
 
@@ -174,7 +177,7 @@ sign is interpreted as wildcard matching all methods for both parameters. <code
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
      <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"params"</span><span class="nt">/&gt;</span>
      <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"validation"</span><span class="nt">/&gt;</span>
      <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"workflow"</span><span class="nt">/&gt;</span>
@@ -206,8 +209,7 @@ sign is interpreted as wildcard matching all methods for both parameters. <code
      <span class="nt">&lt;/interceptor-ref&gt;</span>
      <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>good_result.ftl<span class="nt">&lt;/result&gt;</span>
  <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/dependency-injection.html b/content/core-developers/dependency-injection.html
index 427b479..93faee0 100644
--- a/content/core-developers/dependency-injection.html
+++ b/content/core-developers/dependency-injection.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/core-developers/development-mode.html b/content/core-developers/development-mode.html
index 88a8a73..07c759f 100644
--- a/content/core-developers/development-mode.html
+++ b/content/core-developers/development-mode.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -169,14 +168,13 @@ since the entire configuration will be reloaded on every request.</p>
 <p>If you experience slow page rendering when <code class="highlighter-rouge">devMode</code> is on it’s mostly because Freemarker cache is disabled during 
 <code class="highlighter-rouge">devMode</code>. You can explicit enable cache and any other options disabled by <code class="highlighter-rouge">devMode</code>, see example below:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.devMode"</span> <span class="na">value=</span><span class="s">"true"</span> <span class="nt">/&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.devMode"</span> <span class="na">value=</span><span class="s">"true"</span> <span class="nt">/&gt;</span>
 <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.i18n.reload"</span> <span class="na">value=</span><span class="s">"false"</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.configuration.xml.reload"</span> <span class="na">value=</span><span class="s">"false"</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.freemarker.templatesCache"</span> <span class="na">value=</span><span class="s">"true"</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.freemarker.templatesCache.updateDelay"</span> <span class="na">value=</span><span class="s">"120"</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.freemarker.mru.max.strong.size"</span> <span class="na">value=</span><span class="s">"120"</span><span class="nt">/&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 <p>As you can see, you can switch <code class="highlighter-rouge">devMode</code> on and still have production options on as well.</p>
 
 <p>Please remember to use production optimized options which can be different than these used during development 
diff --git a/content/core-developers/dispatcher-listener.html b/content/core-developers/dispatcher-listener.html
index 8d4c3a4..ddcc50a 100644
--- a/content/core-developers/dispatcher-listener.html
+++ b/content/core-developers/dispatcher-listener.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -136,20 +135,19 @@ with a Dispatcher.</p>
 
 <h2 id="example">Example</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>  <span class="kd">static</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>  <span class="kd">static</span> <span class="o">{</span>
      <span class="n">Dispatcher</span><span class="o">.</span><span class="na">addDispatcherListener</span><span class="o">(</span><span class="k">new</span> <span class="n">DispatcherListener</span><span class="o">()</span> <span class="o">{</span>
-         <span class="kd">public</span> <span class="kt">void</span> <span class="n">dispatcherInitialized</span><span class="o">(</span><span class="n">Dispatcher</span> <span class="n">du</span><span class="o">)</span> <span class="o">{</span>
+         <span class="kd">public</span> <span class="kt">void</span> <span class="nf">dispatcherInitialized</span><span class="o">(</span><span class="n">Dispatcher</span> <span class="n">du</span><span class="o">)</span> <span class="o">{</span>
             <span class="c1">// do something to Dispatcher after it is initialized eg.</span>
             <span class="n">du</span><span class="o">.</span><span class="na">setConfigurationManager</span><span class="o">(....);</span>
          <span class="o">}</span>
 
-         <span class="kd">public</span> <span class="kt">void</span> <span class="n">dispatcherDestroyed</span><span class="o">(</span><span class="n">Dispatcher</span> <span class="n">du</span><span class="o">)</span> <span class="o">{</span>
+         <span class="kd">public</span> <span class="kt">void</span> <span class="nf">dispatcherDestroyed</span><span class="o">(</span><span class="n">Dispatcher</span> <span class="n">du</span><span class="o">)</span> <span class="o">{</span>
             <span class="c1">// do some cleanup after Dispatcher is destroyed.</span>
          <span class="o">}</span>
      <span class="o">});</span>
   <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/dispatcher-result.html b/content/core-developers/dispatcher-result.html
index a226607..c89c6e0 100644
--- a/content/core-developers/dispatcher-result.html
+++ b/content/core-developers/dispatcher-result.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -139,12 +138,12 @@ data between them using <code class="highlighter-rouge">request.setAttribute()</
 <p>There are three possible ways the result can be executed:</p>
 
 <ul>
-  <li>If we are in the scope of a JSP (a PageContext is available), PageContext’s <code class="highlighter-rouge"><span class="p">{</span><span class="err">@link</span><span class="w"> </span><span class="err">PageContext#include(String)</span><span class="w"> </span><span class="err">include</span><span class="p">}</span></code> 
+  <li>If we are in the scope of a JSP (a PageContext is available), PageContext’s <code class="highlighter-rouge">{@link PageContext#include(String) include}</code> 
 method is called.</li>
   <li>If there is no PageContext and we’re not in any sort of include (there is no <code class="highlighter-rouge">javax.servlet.include.servlet_path</code> 
-in the request attributes), then a call to <code class="highlighter-rouge"><span class="p">{</span><span class="err">@link</span><span class="w"> </span><span class="err">RequestDispatcher#forward(javax.servlet.ServletRequest,</span><span class="w"> </span><span class="err">javax.servlet.ServletResponse)</span><span class="w"> </span><span class="err">forward</span><span class="p">}</span></code> 
+in the request attributes), then a call to <code class="highlighter-rouge">{@link RequestDispatcher#forward(javax.servlet.ServletRequest, javax.servlet.ServletResponse) forward}</code> 
 is made.</li>
-  <li>Otherwise, <code class="highlighter-rouge"><span class="p">{</span><span class="err">@link</span><span class="w"> </span><span class="err">RequestDispatcher#include(javax.servlet.ServletRequest,</span><span class="w"> </span><span class="err">javax.servlet.ServletResponse)</span><span class="w"> </span><span class="err">include</span><span class="p">}</span></code> 
+  <li>Otherwise, <code class="highlighter-rouge">{@link RequestDispatcher#include(javax.servlet.ServletRequest, javax.servlet.ServletResponse) include}</code> 
 is called.</li>
 </ul>
 
@@ -157,11 +156,10 @@ is called.</li>
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span> <span class="na">type=</span><span class="s">"dispatcher"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span> <span class="na">type=</span><span class="s">"dispatcher"</span><span class="nt">&gt;</span>
   <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"location"</span><span class="nt">&gt;</span>foo.jsp<span class="nt">&lt;/param&gt;</span>
 <span class="nt">&lt;/result&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/dispatcher.html b/content/core-developers/dispatcher.html
index 683582d..d535f72 100644
--- a/content/core-developers/dispatcher.html
+++ b/content/core-developers/dispatcher.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/core-developers/double-range-field-validator-annotation.html b/content/core-developers/double-range-field-validator-annotation.html
index a9d9b5b..e48cfcc 100644
--- a/content/core-developers/double-range-field-validator-annotation.html
+++ b/content/core-developers/double-range-field-validator-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -239,9 +238,8 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nd">@DoubleRangeFieldValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span><span class="o">,</span> <span class= [...]
-</code></pre>
-</div>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@DoubleRangeFieldValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span> [...]
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/double-validator.html b/content/core-developers/double-validator.html
index be2addb..bce82f5 100644
--- a/content/core-developers/double-validator.html
+++ b/content/core-developers/double-validator.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -157,7 +156,7 @@ Do not use <code class="highlighter-rouge">${minInclusiveExpression}</code>, <co
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;validators&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;validators&gt;
     &lt;!-- Plain Validator Syntax --&gt;
     &lt;validator type="double"&gt;
         &lt;param name="fieldName"&gt;percentage&lt;/param&gt;
@@ -184,8 +183,7 @@ Do not use <code class="highlighter-rouge">${minInclusiveExpression}</code>, <co
         &lt;/field-validator&gt;
     &lt;/field&gt;
 &lt;/validators&gt;
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/element-annotation.html b/content/core-developers/element-annotation.html
index d6d410a..3a45610 100644
--- a/content/core-developers/element-annotation.html
+++ b/content/core-developers/element-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -162,14 +161,13 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="c1">// The key property for User objects within the users collection is the &lt;code&gt;userName&lt;/code&gt; attribute.</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// The key property for User objects within the users collection is the &lt;code&gt;userName&lt;/code&gt; attribute.</span>
 <span class="nd">@Element</span><span class="o">(</span> <span class="n">value</span> <span class="o">=</span> <span class="n">com</span><span class="o">.</span><span class="na">acme</span><span class="o">.</span><span class="na">User</span><span class="o">.</span><span class="na">class</span> <span class="o">)</span>
 <span class="kd">private</span> <span class="n">Map</span> <span class="n">userMap</span><span class="o">;</span>
 
 <span class="nd">@Element</span><span class="o">(</span> <span class="n">value</span> <span class="o">=</span> <span class="n">com</span><span class="o">.</span><span class="na">acme</span><span class="o">.</span><span class="na">User</span><span class="o">.</span><span class="na">class</span> <span class="o">)</span>
 <span class="kd">public</span> <span class="n">List</span> <span class="n">userList</span><span class="o">;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/email-validator-annotation.html b/content/core-developers/email-validator-annotation.html
index d7bd41e..92e2254 100644
--- a/content/core-developers/email-validator-annotation.html
+++ b/content/core-developers/email-validator-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -188,9 +187,8 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nd">@EmailValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span><span class="o">)</span>
-</code></pre>
-</div>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@EmailValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span><span class [...]
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/email-validator.html b/content/core-developers/email-validator.html
index 9b1ec8b..a666b6f 100644
--- a/content/core-developers/email-validator.html
+++ b/content/core-developers/email-validator.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -136,9 +135,8 @@
 
 <p>The regular expression used to validate that the string is an email address is:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>\\b^['_a-z0-9-\\+](\\.['_a-z0-9-\\+])@[a-z0-9-](\\.[a-z0-9-])\\.([a-z]{2,6})$\\b
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>\\b^['_a-z0-9-\\+](\\.['_a-z0-9-\\+])@[a-z0-9-](\\.[a-z0-9-])\\.([a-z]{2,6})$\\b
+</code></pre></div></div>
 
 <p>You can also specify <code class="highlighter-rouge">expression</code>, <code class="highlighter-rouge">caseSensitive</code> and <code class="highlighter-rouge">trim</code> params as a OGNL expression, see the example below.</p>
 
@@ -157,7 +155,7 @@ Do not use <code class="highlighter-rouge">${regexExpression}</code>, <code clas
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;!-- Plain Validator Syntax --&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;!-- Plain Validator Syntax --&gt;
 &lt;validators&gt;
     &lt;validator type="email"&gt;
         &lt;param name="fieldName"&gt;myEmail&lt;/param&gt;
@@ -183,8 +181,7 @@ Do not use <code class="highlighter-rouge">${regexExpression}</code>, <code clas
       &lt;message&gt;Must provide a valid email&lt;/message&gt;
    &lt;/field-validator&gt;
 &lt;/field&gt;
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/exception-configuration.html b/content/core-developers/exception-configuration.html
index 6f218c2..67494f8 100644
--- a/content/core-developers/exception-configuration.html
+++ b/content/core-developers/exception-configuration.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -139,7 +138,7 @@ Below is a snippet from <code class="highlighter-rouge">struts-default.xml</code
 
 <p><strong>snippet of struts-default.xml</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>...
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code>...
 <span class="nt">&lt;interceptors&gt;</span>
     ...
     <span class="nt">&lt;interceptor</span> <span class="na">name=</span><span class="s">"exception"</span> <span class="na">class=</span><span class="s">"com.opensymphony.xwork.interceptor.ExceptionMappingInterceptor"</span><span class="nt">/&gt;</span>
@@ -170,8 +169,7 @@ Below is a snippet from <code class="highlighter-rouge">struts-default.xml</code
     <span class="nt">&lt;/interceptor-ref&gt;</span>
 <span class="nt">&lt;/interceptor-stack&gt;</span>
 ...
-</code></pre>
-</div>
+</code></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 class="highlighter-rouge">&lt;exception-mapping/&gt;</code> - globally or for a specific action mapping. The exception 
@@ -191,7 +189,7 @@ action mapping, and if not found, it looks for a global Result.</p>
 
 <p><strong>snippet from struts.xml</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;struts&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;struts&gt;</span>
     <span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"default"</span><span class="nt">&gt;</span>
         ...
         <span class="nt">&lt;global-results&gt;</span>
@@ -212,8 +210,7 @@ action mapping, and if not found, it looks for a global Result.</p>
         ...
     <span class="nt">&lt;/package&gt;</span>
 <span class="nt">&lt;/xwork&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>In the example above, here is what happens based upon each Exception:</p>
 
diff --git a/content/core-developers/exception-interceptor.html b/content/core-developers/exception-interceptor.html
index 62ef453..71ff95e 100644
--- a/content/core-developers/exception-interceptor.html
+++ b/content/core-developers/exception-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -173,7 +172,7 @@ logging etc.</p>
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nt">&lt;struts&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt">&lt;struts&gt;</span>
      <span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"default"</span> <span class="na">extends=</span><span class="s">"xwork-default"</span><span class="nt">&gt;</span>
          <span class="nt">&lt;global-results&gt;</span>
              <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"error"</span> <span class="na">type=</span><span class="s">"freemarker"</span><span class="nt">&gt;</span>error.ftl<span class="nt">&lt;/result&gt;</span>
@@ -192,8 +191,7 @@ logging etc.</p>
          <span class="nt">&lt;/action&gt;</span>
      <span class="nt">&lt;/package&gt;</span>
  <span class="nt">&lt;/struts&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/execute-and-wait-interceptor.html b/content/core-developers/execute-and-wait-interceptor.html
index e5aad5b..f0e37ce 100644
--- a/content/core-developers/execute-and-wait-interceptor.html
+++ b/content/core-developers/execute-and-wait-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -192,7 +191,7 @@ process extension, extend <code class="highlighter-rouge">ExecuteAndWaitIntercep
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
      <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"completeStack"</span><span class="nt">/&gt;</span>
      <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"execAndWait"</span><span class="nt">/&gt;</span>
      <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"wait"</span><span class="nt">&gt;</span>longRunningAction-wait.jsp<span class="nt">&lt;/result&gt;</span>
@@ -248,8 +247,7 @@ process extension, extend <code class="highlighter-rouge">ExecuteAndWaitIntercep
  <span class="nt">&lt;/action&gt;</span>
  <span class="nt">&lt;/pre&gt;</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/expression-validator-annotation.html b/content/core-developers/expression-validator-annotation.html
index 2ca24bf..9a31d79 100644
--- a/content/core-developers/expression-validator-annotation.html
+++ b/content/core-developers/expression-validator-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -182,10 +181,9 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nd">@ExpressionValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span><span class="o">,</span> <span class="n">ex [...]
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@ExpressionValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span><span  [...]
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/expression-validator.html b/content/core-developers/expression-validator.html
index d8a91a3..6e895c1 100644
--- a/content/core-developers/expression-validator.html
+++ b/content/core-developers/expression-validator.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -142,14 +141,13 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;validators&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;validators&gt;
       &lt;validator type="expression"&gt;
          &lt;param name="expression"&gt; .... &lt;/param&gt;
          &lt;message&gt;Failed to meet Ognl Expression  .... &lt;/message&gt;
       &lt;/validator&gt;
 &lt;/validators&gt;
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/field-expression-validator-annotation.html b/content/core-developers/field-expression-validator-annotation.html
index be474b2..22b7e7f 100644
--- a/content/core-developers/field-expression-validator-annotation.html
+++ b/content/core-developers/field-expression-validator-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -189,10 +188,9 @@ returns false when it is evaluated against the value stack.</p>
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nd">@FieldExpressionValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span><span class="o">,</span> <span class=" [...]
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@FieldExpressionValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span>< [...]
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/fieldexpression-validator.html b/content/core-developers/fieldexpression-validator.html
index f47344e..b8c5dd5 100644
--- a/content/core-developers/fieldexpression-validator.html
+++ b/content/core-developers/fieldexpression-validator.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -143,7 +142,7 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;!-- Plain Validator Syntax --&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;!-- Plain Validator Syntax --&gt;
 &lt;validators&gt;
     &lt;!-- Plain Validator Syntax --&gt;
     &lt;validator type="fieldexpression"&gt;
@@ -160,8 +159,7 @@
         &lt;/field-validator&gt;
     &lt;/field&gt;
 &lt;/vaidators&gt;
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/file-upload-interceptor.html b/content/core-developers/file-upload-interceptor.html
index a6a9da9..363da78 100644
--- a/content/core-developers/file-upload-interceptor.html
+++ b/content/core-developers/file-upload-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -182,32 +181,30 @@ and which are not.</p>
 
 <p><strong>Example action mapping:</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"doUpload"</span> <span class="na">class=</span><span class="s">"com.example.UploadAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"doUpload"</span> <span class="na">class=</span><span class="s">"com.example.UploadAction"</span><span class="nt">&gt;</span>
      <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"fileUpload"</span><span class="nt">/&gt;</span>
      <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"basicStack"</span><span class="nt">/&gt;</span>
      <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>good_result.jsp<span class="nt">&lt;/result&gt;</span>
  <span class="nt">&lt;/action&gt;</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Notice the interceptor configuration in the preceding example.</p>
 
 <p><strong>Example JSP form tags:</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>   <span class="nt">&lt;s:form</span> <span class="na">action=</span><span class="s">"doUpload"</span> <span class="na">method=</span><span class="s">"post"</span> <span class="na">enctype=</span><span class="s">"multipart/form-data"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code>   <span class="nt">&lt;s:form</span> <span class="na">action=</span><span class="s">"doUpload"</span> <span class="na">method=</span><span class="s">"post"</span> <span class="na">enctype=</span><span class="s">"multipart/form-data"</span><span class="nt">&gt;</span>
        <span class="nt">&lt;s:file</span> <span class="na">name=</span><span class="s">"upload"</span> <span class="na">label=</span><span class="s">"File"</span><span class="nt">/&gt;</span>
        <span class="nt">&lt;s:submit/&gt;</span>
    <span class="nt">&lt;/s:form&gt;</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <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="highlighter-rouge"><pre class="highlight"><code>    <span class="kn">package</span> <span class="n">com</span><span class="o">.</span><span class="na">example</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>    <span class="kn">package</span> <span class="n">com</span><span class="o">.</span><span class="na">example</span><span class="o">;</span>
 
     <span class="kn">import</span> <span class="nn">java.io.File</span><span class="o">;</span>
     <span class="kn">import</span> <span class="nn">com.opensymphony.xwork2.ActionSupport</span><span class="o">;</span>
@@ -217,36 +214,34 @@ and which are not.</p>
        <span class="kd">private</span> <span class="n">String</span> <span class="n">contentType</span><span class="o">;</span>
        <span class="kd">private</span> <span class="n">String</span> <span class="n">filename</span><span class="o">;</span>
 
-       <span class="kd">public</span> <span class="kt">void</span> <span class="n">setUpload</span><span class="o">(</span><span class="n">File</span> <span class="n">file</span><span class="o">)</span> <span class="o">{</span>
+       <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setUpload</span><span class="o">(</span><span class="n">File</span> <span class="n">file</span><span class="o">)</span> <span class="o">{</span>
           <span class="k">this</span><span class="o">.</span><span class="na">file</span> <span class="o">=</span> <span class="n">file</span><span class="o">;</span>
        <span class="o">}</span>
 
-       <span class="kd">public</span> <span class="kt">void</span> <span class="n">setUploadContentType</span><span class="o">(</span><span class="n">String</span> <span class="n">contentType</span><span class="o">)</span> <span class="o">{</span>
+       <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setUploadContentType</span><span class="o">(</span><span class="n">String</span> <span class="n">contentType</span><span class="o">)</span> <span class="o">{</span>
           <span class="k">this</span><span class="o">.</span><span class="na">contentType</span> <span class="o">=</span> <span class="n">contentType</span><span class="o">;</span>
        <span class="o">}</span>
 
-       <span class="kd">public</span> <span class="kt">void</span> <span class="n">setUploadFileName</span><span class="o">(</span><span class="n">String</span> <span class="n">filename</span><span class="o">)</span> <span class="o">{</span>
+       <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setUploadFileName</span><span class="o">(</span><span class="n">String</span> <span class="n">filename</span><span class="o">)</span> <span class="o">{</span>
           <span class="k">this</span><span class="o">.</span><span class="na">filename</span> <span class="o">=</span> <span class="n">filename</span><span class="o">;</span>
        <span class="o">}</span>
 
-       <span class="kd">public</span> <span class="n">String</span> <span class="n">execute</span><span class="o">()</span> <span class="o">{</span>
+       <span class="kd">public</span> <span class="n">String</span> <span class="nf">execute</span><span class="o">()</span> <span class="o">{</span>
           <span class="c1">//...</span>
           <span class="k">return</span> <span class="n">SUCCESS</span><span class="o">;</span>
        <span class="o">}</span>
   <span class="o">}</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p><strong>Setting parameters example:</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"fileUpload"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"fileUpload"</span><span class="nt">&gt;</span>
   <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"allowedTypes"</span><span class="nt">&gt;</span>
      image/png,image/gif,image/jpeg
   <span class="nt">&lt;/param&gt;</span>
 <span class="nt">&lt;/interceptor-ref&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>This part is optional and would be done in place of the <code class="highlighter-rouge">&lt;interceptor-ref name="fileUpload"/&gt;</code> line in the action mapping 
 example above.</p>
diff --git a/content/core-developers/file-upload.html b/content/core-developers/file-upload.html
index e0faba8..e0fea24 100644
--- a/content/core-developers/file-upload.html
+++ b/content/core-developers/file-upload.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -203,7 +202,7 @@ distribution, you must add them into your project. The libraries needed are:</p>
 
 <h3 id="struts-20x-file-upload-dependencies">Struts 2.0.x File Upload Dependencies</h3>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>commons-fileupload<span class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>commons-fileupload<span class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.1.1<span class="nt">&lt;/version&gt;</span>
@@ -213,12 +212,11 @@ distribution, you must add them into your project. The libraries needed are:</p>
     <span class="nt">&lt;artifactId&gt;</span>commons-io<span class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.0<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="struts-21x-file-upload-dependencies">Struts 2.1.x File Upload Dependencies</h3>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>commons-fileupload<span class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>commons-fileupload<span class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.2.1<span class="nt">&lt;/version&gt;</span>
@@ -228,8 +226,7 @@ distribution, you must add them into your project. The libraries needed are:</p>
     <span class="nt">&lt;artifactId&gt;</span>commons-io<span class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.3.2<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="basic-usage">Basic Usage</h2>
 
@@ -239,12 +236,11 @@ Action class as you typically would.</p>
 
 <h3 id="example-action-mapping">Example action mapping:</h3>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"doUpload"</span> <span class="na">class=</span><span class="s">"com.example.UploadAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"doUpload"</span> <span class="na">class=</span><span class="s">"com.example.UploadAction"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>good_result.jsp<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>A form must be create with a form field of type file, <code class="highlighter-rouge">&lt;INPUT type="file" name="upload"&gt;</code>. The form used to upload the file must have its 
 encoding type set to <code class="highlighter-rouge">multipart/form-data</code>, <code class="highlighter-rouge">&lt;form action="doUpload" enctype="multipart/form-data" method="post"&gt;</code>. The standard procedure 
@@ -252,19 +248,18 @@ for adding these elements is by using the Struts 2 tag libraries as shown in the
 
 <h3 id="example-jsp-form-tags">Example JSP form tags:</h3>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>   <span class="nt">&lt;s:form</span> <span class="na">action=</span><span class="s">"doUpload"</span> <span class="na">method=</span><span class="s">"post"</span> <span class="na">enctype=</span><span class="s">"multipart/form-data"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code>   <span class="nt">&lt;s:form</span> <span class="na">action=</span><span class="s">"doUpload"</span> <span class="na">method=</span><span class="s">"post"</span> <span class="na">enctype=</span><span class="s">"multipart/form-data"</span><span class="nt">&gt;</span>
        <span class="nt">&lt;s:file</span> <span class="na">name=</span><span class="s">"upload"</span> <span class="na">label=</span><span class="s">"File"</span><span class="nt">/&gt;</span>
        <span class="nt">&lt;s:submit/&gt;</span>
    <span class="nt">&lt;/s:form&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>The fileUpload interceptor will use setter injection to insert the uploaded file and related data into your Action class. For a form field 
 named <code class="highlighter-rouge">upload</code> you would provide the three setter methods shown in the following example:</p>
 
 <h3 id="example-action-class">Example Action class:</h3>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="kn">package</span> <span class="n">com</span><span class="o">.</span><span class="na">example</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">package</span> <span class="n">com</span><span class="o">.</span><span class="na">example</span><span class="o">;</span>
 
    <span class="kn">import</span> <span class="nn">java.io.File</span><span class="o">;</span>
    <span class="kn">import</span> <span class="nn">com.opensymphony.xwork2.ActionSupport</span><span class="o">;</span>
@@ -274,26 +269,25 @@ named <code class="highlighter-rouge">upload</code> you would provide the three
       <span class="kd">private</span> <span class="n">String</span> <span class="n">contentType</span><span class="o">;</span>
       <span class="kd">private</span> <span class="n">String</span> <span class="n">filename</span><span class="o">;</span>
 
-      <span class="kd">public</span> <span class="kt">void</span> <span class="n">setUpload</span><span class="o">(</span><span class="n">File</span> <span class="n">file</span><span class="o">)</span> <span class="o">{</span>
+      <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setUpload</span><span class="o">(</span><span class="n">File</span> <span class="n">file</span><span class="o">)</span> <span class="o">{</span>
          <span class="k">this</span><span class="o">.</span><span class="na">file</span> <span class="o">=</span> <span class="n">file</span><span class="o">;</span>
       <span class="o">}</span>
 
-      <span class="kd">public</span> <span class="kt">void</span> <span class="n">setUploadContentType</span><span class="o">(</span><span class="n">String</span> <span class="n">contentType</span><span class="o">)</span> <span class="o">{</span>
+      <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setUploadContentType</span><span class="o">(</span><span class="n">String</span> <span class="n">contentType</span><span class="o">)</span> <span class="o">{</span>
          <span class="k">this</span><span class="o">.</span><span class="na">contentType</span> <span class="o">=</span> <span class="n">contentType</span><span class="o">;</span>
       <span class="o">}</span>
 
-      <span class="kd">public</span> <span class="kt">void</span> <span class="n">setUploadFileName</span><span class="o">(</span><span class="n">String</span> <span class="n">filename</span><span class="o">)</span> <span class="o">{</span>
+      <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setUploadFileName</span><span class="o">(</span><span class="n">String</span> <span class="n">filename</span><span class="o">)</span> <span class="o">{</span>
          <span class="k">this</span><span class="o">.</span><span class="na">filename</span> <span class="o">=</span> <span class="n">filename</span><span class="o">;</span>
       <span class="o">}</span>
 
-      <span class="kd">public</span> <span class="n">String</span> <span class="n">execute</span><span class="o">()</span> <span class="o">{</span>
+      <span class="kd">public</span> <span class="n">String</span> <span class="nf">execute</span><span class="o">()</span> <span class="o">{</span>
          <span class="c1">//...</span>
          <span class="k">return</span> <span class="n">SUCCESS</span><span class="o">;</span>
       <span class="o">}</span>
  <span class="o">}</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <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>
@@ -343,12 +337,12 @@ details see <code class="highlighter-rouge">struts-fileupload.xml</code> in the
 
 <p><code class="highlighter-rouge">MultipleFileUploadUsingArrayAction.java</code></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MultipleFileUploadUsingArrayAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MultipleFileUploadUsingArrayAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
 	<span class="kd">private</span> <span class="n">File</span><span class="o">[]</span> <span class="n">uploads</span><span class="o">;</span>
 	<span class="kd">private</span> <span class="n">String</span><span class="o">[]</span> <span class="n">uploadFileNames</span><span class="o">;</span>
 	<span class="kd">private</span> <span class="n">String</span><span class="o">[]</span> <span class="n">uploadContentTypes</span><span class="o">;</span>
 
-	<span class="kd">public</span> <span class="n">String</span> <span class="n">upload</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">String</span> <span class="nf">upload</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
 		<span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"\n\n upload2"</span><span class="o">);</span>
 		<span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"files:"</span><span class="o">);</span>
 		<span class="k">for</span> <span class="o">(</span><span class="n">File</span> <span class="n">u</span> <span class="o">:</span> <span class="n">uploads</span><span class="o">)</span> <span class="o">{</span>
@@ -365,27 +359,26 @@ details see <code class="highlighter-rouge">struts-fileupload.xml</code> in the
 		<span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"\n\n"</span><span class="o">);</span>
 		<span class="k">return</span> <span class="n">SUCCESS</span><span class="o">;</span>
 	<span class="o">}</span>
-	<span class="kd">public</span> <span class="n">File</span><span class="o">[]</span> <span class="n">getUpload</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">File</span><span class="o">[]</span> <span class="nf">getUpload</span><span class="o">()</span> <span class="o">{</span>
 		<span class="k">return</span> <span class="k">this</span><span class="o">.</span><span class="na">uploads</span><span class="o">;</span>
 	<span class="o">}</span>
-	<span class="kd">public</span> <span class="kt">void</span> <span class="n">setUpload</span><span class="o">(</span><span class="n">File</span><span class="o">[]</span> <span class="n">upload</span><span class="o">)</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">setUpload</span><span class="o">(</span><span class="n">File</span><span class="o">[]</span> <span class="n">upload</span><span class="o">)</span> <span class="o">{</span>
 		<span class="k">this</span><span class="o">.</span><span class="na">uploads</span> <span class="o">=</span> <span class="n">upload</span><span class="o">;</span>
 	<span class="o">}</span>
-	<span class="kd">public</span> <span class="n">String</span><span class="o">[]</span> <span class="n">getUploadFileName</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">String</span><span class="o">[]</span> <span class="nf">getUploadFileName</span><span class="o">()</span> <span class="o">{</span>
 		<span class="k">return</span> <span class="k">this</span><span class="o">.</span><span class="na">uploadFileNames</span><span class="o">;</span>
 	<span class="o">}</span>
-	<span class="kd">public</span> <span class="kt">void</span> <span class="n">setUploadFileName</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">uploadFileName</span><span class="o">)</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">setUploadFileName</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">uploadFileName</span><span class="o">)</span> <span class="o">{</span>
 		<span class="k">this</span><span class="o">.</span><span class="na">uploadFileNames</span> <span class="o">=</span> <span class="n">uploadFileName</span><span class="o">;</span>
 	<span class="o">}</span>
-	<span class="kd">public</span> <span class="n">String</span><span class="o">[]</span> <span class="n">getUploadContentType</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">String</span><span class="o">[]</span> <span class="nf">getUploadContentType</span><span class="o">()</span> <span class="o">{</span>
 		<span class="k">return</span> <span class="k">this</span><span class="o">.</span><span class="na">uploadContentTypes</span><span class="o">;</span>
 	<span class="o">}</span>
-	<span class="kd">public</span> <span class="kt">void</span> <span class="n">setUploadContentType</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">uploadContentType</span><span class="o">)</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">setUploadContentType</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">uploadContentType</span><span class="o">)</span> <span class="o">{</span>
 		<span class="k">this</span><span class="o">.</span><span class="na">uploadContentTypes</span> <span class="o">=</span> <span class="n">uploadContentType</span><span class="o">;</span>
 	<span class="o">}</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="uploading-multiple-files-using-lists">Uploading Multiple Files using Lists</h3>
 
@@ -401,30 +394,30 @@ details see <code class="highlighter-rouge">struts-fileupload.xml</code> in the
 
 <p><code class="highlighter-rouge">MultipleFileUploadUsingListAction.java</code></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MultipleFileUploadUsingListAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MultipleFileUploadUsingListAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
 	<span class="kd">private</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">File</span><span class="o">&gt;</span> <span class="n">uploads</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">File</span><span class="o">&gt;();</span>
 	<span class="kd">private</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">uploadFileNames</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;();</span>
 	<span class="kd">private</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">uploadContentTypes</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;();</span>
 
-	<span class="kd">public</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">File</span><span class="o">&gt;</span> <span class="n">getUpload</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">File</span><span class="o">&gt;</span> <span class="nf">getUpload</span><span class="o">()</span> <span class="o">{</span>
 		<span class="k">return</span> <span class="k">this</span><span class="o">.</span><span class="na">uploads</span><span class="o">;</span>
 	<span class="o">}</span>
-	<span class="kd">public</span> <span class="kt">void</span> <span class="n">setUpload</span><span class="o">(</span><span class="n">List</span><span class="o">&lt;</span><span class="n">File</span><span class="o">&gt;</span> <span class="n">uploads</span><span class="o">)</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">setUpload</span><span class="o">(</span><span class="n">List</span><span class="o">&lt;</span><span class="n">File</span><span class="o">&gt;</span> <span class="n">uploads</span><span class="o">)</span> <span class="o">{</span>
 		<span class="k">this</span><span class="o">.</span><span class="na">uploads</span> <span class="o">=</span> <span class="n">uploads</span><span class="o">;</span>
 	<span class="o">}</span>
-	<span class="kd">public</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">getUploadFileName</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="nf">getUploadFileName</span><span class="o">()</span> <span class="o">{</span>
 		<span class="k">return</span> <span class="k">this</span><span class="o">.</span><span class="na">uploadFileNames</span><span class="o">;</span>
 	<span class="o">}</span>
-	<span class="kd">public</span> <span class="kt">void</span> <span class="n">setUploadFileName</span><span class="o">(</span><span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">uploadFileNames</span><span class="o">)</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">setUploadFileName</span><span class="o">(</span><span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">uploadFileNames</span><span class="o">)</span> <span class="o">{</span>
 		<span class="k">this</span><span class="o">.</span><span class="na">uploadFileNames</span> <span class="o">=</span> <span class="n">uploadFileNames</span><span class="o">;</span>
 	<span class="o">}</span>
-	<span class="kd">public</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">getUploadContentType</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="nf">getUploadContentType</span><span class="o">()</span> <span class="o">{</span>
 		<span class="k">return</span> <span class="k">this</span><span class="o">.</span><span class="na">uploadContentTypes</span><span class="o">;</span>
 	<span class="o">}</span>
-	<span class="kd">public</span> <span class="kt">void</span> <span class="n">setUploadContentType</span><span class="o">(</span><span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">contentTypes</span><span class="o">)</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="kt">void</span> <span class="nf">setUploadContentType</span><span class="o">(</span><span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">contentTypes</span><span class="o">)</span> <span class="o">{</span>
 		<span class="k">this</span><span class="o">.</span><span class="na">uploadContentTypes</span> <span class="o">=</span> <span class="n">contentTypes</span><span class="o">;</span>
 	<span class="o">}</span>
-	<span class="kd">public</span> <span class="n">String</span> <span class="n">upload</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">String</span> <span class="nf">upload</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
 		<span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"\n\n upload1"</span><span class="o">);</span>
 		<span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"files:"</span><span class="o">);</span>
 		<span class="k">for</span> <span class="o">(</span><span class="n">File</span> <span class="n">u</span> <span class="o">:</span> <span class="n">uploads</span><span class="o">)</span> <span class="o">{</span>
@@ -442,19 +435,17 @@ details see <code class="highlighter-rouge">struts-fileupload.xml</code> in the
 		<span class="k">return</span> <span class="n">SUCCESS</span><span class="o">;</span>
 	<span class="o">}</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="advanced-configuration">Advanced Configuration</h2>
 
 <p>The Struts 2 <code class="highlighter-rouge">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>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>struts.multipart.parser=jakarta
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>struts.multipart.parser=jakarta
 struts.multipart.saveDir=
 struts.multipart.maxSize=2097152
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <blockquote>
   <p>Please remember that the <code class="highlighter-rouge">struts.multipart.maxSize</code> is the size limit of the whole request, which means when you uploading multiple files, 
@@ -463,7 +454,7 @@ the sum of their size must be below the <code class="highlighter-rouge">struts.m
 
 <p>In order to change theses settings you define a constant in your applications <code class="highlighter-rouge">struts.xml</code> file like so:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="cp">&lt;?xml version="1.0" encoding="UTF-8"?&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="cp">&lt;?xml version="1.0" encoding="UTF-8"?&gt;</span>
 <span class="cp">&lt;!DOCTYPE struts PUBLIC 
 	"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" 
 	"http://struts.apache.org/dtds/struts-2.0.dtd"&gt;</span>
@@ -471,12 +462,11 @@ the sum of their size must be below the <code class="highlighter-rouge">struts.m
     <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.multipart.maxSize"</span> <span class="na">value=</span><span class="s">"1000000"</span> <span class="nt">/&gt;</span>
     ...
 <span class="nt">&lt;/struts&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Additionally the <code class="highlighter-rouge">fileUpload</code> interceptor has settings that can be put in place for individual action mappings by customizing your interceptor stack.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"doUpload"</span> <span class="na">class=</span><span class="s">"com.example.UploadAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"doUpload"</span> <span class="na">class=</span><span class="s">"com.example.UploadAction"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"basicStack"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"fileUpload"</span><span class="nt">&gt;</span>
         <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"allowedTypes"</span><span class="nt">&gt;</span>text/plain<span class="nt">&lt;/param&gt;</span>
@@ -486,8 +476,7 @@ the sum of their size must be below the <code class="highlighter-rouge">struts.m
 
     <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>good_result.jsp<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="file-size-limits">File Size Limits</h3>
 
@@ -498,7 +487,7 @@ to receive. If you are uploading more than one file on a form the <code class="h
 file sizes. The other setting, <code class="highlighter-rouge">maximumSize</code>, is an interceptor setting that is used to ensure a particular Action does not receive a file 
 that is too large. Notice the locations of both settings in the following example:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="cp">&lt;?xml version="1.0" encoding="UTF-8"?&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="cp">&lt;?xml version="1.0" encoding="UTF-8"?&gt;</span>
 <span class="cp">&lt;!DOCTYPE struts PUBLIC 
 	"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" 
 	"http://struts.apache.org/dtds/struts-2.0.dtd"&gt;</span>
@@ -517,15 +506,14 @@ that is too large. Notice the locations of both settings in the following exampl
     <span class="nt">&lt;/action&gt;</span>
 <span class="nt">&lt;/struts&gt;</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="file-types">File Types</h3>
 
 <p>There are two ways to limit the uploaded file type, decoratively and programmatically. To decoratively 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>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"doUpload"</span> <span class="na">class=</span><span class="s">"com.example.UploadAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"doUpload"</span> <span class="na">class=</span><span class="s">"com.example.UploadAction"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"basicStack"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"fileUpload"</span><span class="nt">&gt;</span>
         <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"allowedTypes"</span><span class="nt">&gt;</span>image/jpeg,image/gif<span class="nt">&lt;/param&gt;</span>
@@ -535,8 +523,7 @@ list of allowedTypes can be specified as a fileUpload interceptor param as shown
 
     <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>good_result.jsp<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <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 
@@ -603,9 +590,8 @@ due to licensing incompatibilities.</p>
 <p>As from Struts version 2.3.18 a new implementation of <code class="highlighter-rouge">MultiPartRequest</code> was added - <code class="highlighter-rouge">JakartaStreamMultiPartRequest</code>. It can be used to handle 
 large files, see <a href="https://issues.apache.org/jira/browse/WW-3025">WW-3025</a> for more details, but you can simple set</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;constant name="struts.multipart.parser" value="jakarta-stream" /&gt;
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;constant name="struts.multipart.parser" value="jakarta-stream" /&gt;
+</code></pre></div></div>
 
 <p>in struts.xml to start using it.</p>
 
@@ -614,9 +600,8 @@ large files, see <a href="https://issues.apache.org/jira/browse/WW-3025">WW-302
 <p>The <code class="highlighter-rouge">struts.multipart.validationRegex</code> is used to define a RegEx to be used to validate if the incoming request is a multipart request. 
 The request must use the <code class="highlighter-rouge">POST</code> method and match the RegEx, by default the RegEx is defined as follow:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>^multipart\\/form-data(; boundary=[a-zA-Z0-9]{1,70})?
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>^multipart\\/form-data(; boundary=[a-zA-Z0-9]{1,70})?
+</code></pre></div></div>
 
 <p>Please read <a href="https://www.w3.org/Protocols/rfc1341/7\_2\_Multipart.html">RFC1341</a> the <strong>Multipart section</strong> for more details, existing 
 Struts <code class="highlighter-rouge">Multipart</code> parsers support only <code class="highlighter-rouge">multipart/form-data</code> content type. This option is available since Struts 2.3.11.</p>
@@ -625,9 +610,8 @@ Struts <code class="highlighter-rouge">Multipart</code> parsers support only <c
 
 <p>You can alternatively disable the whole file upload mechanism defining a constant in <code class="highlighter-rouge">struts.xml</code>:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.multipart.enabled"</span> <span class="na">value=</span><span class="s">"false"</span><span class="nt">/&gt;</span>
-</code></pre>
-</div>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.multipart.enabled"</span> <span class="na">value=</span><span class="s">"false"</span><span class="nt">/&gt;</span>
+</code></pre></div></div>
 
 <p>With this constant in place, Struts will ignore a <code class="highlighter-rouge">Content-Type</code> header and will treat each request as an ordinary http request. 
 This option is available since Struts 2.3.11. </p>
diff --git a/content/core-developers/formatting-dates-and-numbers.html b/content/core-developers/formatting-dates-and-numbers.html
index b328c32..c2e89c3 100644
--- a/content/core-developers/formatting-dates-and-numbers.html
+++ b/content/core-developers/formatting-dates-and-numbers.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -139,24 +138,21 @@ built-in date formatting features.</p>
 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="highlighter-rouge"><pre class="highlight"><code>format.time = {0,time}
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>format.time = {0,time}
 format.number = {0,number,#0.0##}
 format.percent = {0,number,##0.00'%'}
 format.money = {0,number,\u00A4##0.00}
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>An appropriate en_US format definition extension could look like this:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>format.date = {0,date,MM/dd/yy}
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>format.date = {0,date,MM/dd/yy}
+</code></pre></div></div>
 
 <p>In parallel, you could add the following to your de_DE bundle:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>format.date = {0,date,dd.MM.yyyy}
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>format.date = {0,date,dd.MM.yyyy}
+</code></pre></div></div>
 
 <p>Read more on how to define message formats in Sun’s Java API docs for <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/text/MessageFormat.html">MessageFormat</a>.</p>
 
diff --git a/content/core-developers/freemarker-result.html b/content/core-developers/freemarker-result.html
index 5a125ff..328a75a 100644
--- a/content/core-developers/freemarker-result.html
+++ b/content/core-developers/freemarker-result.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -154,9 +153,8 @@ Setting <code class="highlighter-rouge">template_exception_handler=rethrow</code
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span> <span class="na">type=</span><span class="s">"freemarker"</span><span class="nt">&gt;</span>foo.ftl<span class="nt">&lt;/result&gt;</span>
-</code></pre>
-</div>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span> <span class="na">type=</span><span class="s">"freemarker"</span><span class="nt">&gt;</span>foo.ftl<span class="nt">&lt;/result&gt;</span>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/freemarker-support.html b/content/core-developers/freemarker-support.html
index 9db4ee0..49df0d5 100644
--- a/content/core-developers/freemarker-support.html
+++ b/content/core-developers/freemarker-support.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -136,15 +135,14 @@
 
 <p>The <code class="highlighter-rouge">freemarker</code> result type is defined in <code class="highlighter-rouge">struts-default.xml</code>, so normally you just include it, and define your results to use <code class="highlighter-rouge">type="freemarker"</code>.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;include</span> <span class="na">file=</span><span class="s">"struts-default.xml"</span><span class="nt">/&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;include</span> <span class="na">file=</span><span class="s">"struts-default.xml"</span><span class="nt">/&gt;</span>
 ...
 <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"test"</span> <span class="na">class=</span><span class="s">"package.Test"</span><span class="nt">&gt;</span>
   <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span> <span class="na">type=</span><span class="s">"freemarker"</span><span class="nt">&gt;</span>/WEB-INF/views/testView.ftl<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
 ...
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="property-resolution">Property Resolution</h2>
 
@@ -189,18 +187,19 @@ the <code class="highlighter-rouge">&lt;s:select/&gt;</code> pattern. (i.e. taki
 are those that the Freemarker Configuration object expects - see the <a href="https://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-">Freemarker documentation</a>
 for these.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>default_encoding=ISO-8859-1
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>default_encoding=ISO-8859-1
 template_update_delay=5
 locale=no_NO
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="using-struts-ui-tags---or-any-jsp-tag-library">Using struts UI tags - or any JSP Tag Library</h2>
 
-<p>Freemarker has builtin support for using any JSP taglib. You can use JSP taglibs in FreeMarker even if
- - your servlet container has no support for JSP, or 
- - 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.</p>
+<p>Freemarker has builtin support for using any JSP taglib. You can use JSP taglibs in FreeMarker even if</p>
+<ul>
+  <li>your servlet container has no support for JSP, or</li>
+  <li>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.</li>
+</ul>
 
 <pre><code class="language-ftl">&lt;#assign s=JspTaglibs["/WEB-INF/struts.tld"] /&gt;
 
@@ -229,10 +228,9 @@ receive an exception. Other than that, the freemarker tag container behaves as y
 
 <p>and for both case, it will be parsed into:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;input</span> <span class="na">type=</span><span class="s">"text"</span> <span class="na">name=</span><span class="s">"test"</span> <span class="na">value=</span><span class="s">""</span> <span class="na">id=</span><span class="s">"test"</span> <span class="na">placeholder=</span><span class="s">"input"</span> <span class="na">foo=</span><span class="s">"bar"</span><span class="nt">/&gt;</span>
+<div class="language-html highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;input</span> <span class="na">type=</span><span class="s">"text"</span> <span class="na">name=</span><span class="s">"test"</span> <span class="na">value=</span><span class="s">""</span> <span class="na">id=</span><span class="s">"test"</span> <span class="na">placeholder=</span><span class="s">"input"</span> <span class="na">foo=</span><span class="s">"bar"</span><span c [...]
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>You can also use OGNL expressions with dynamic tags like below:</p>
 
diff --git a/content/core-developers/glassfish-2-x.html b/content/core-developers/glassfish-2-x.html
index 351c4c2..27823fe 100644
--- a/content/core-developers/glassfish-2-x.html
+++ b/content/core-developers/glassfish-2-x.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -134,10 +133,9 @@
 
 <p>To have proper support of the <em>Convention Plugin</em>  in Glassfish 2.x when packed as EAR archive add the following constant to <code class="highlighter-rouge">struts.xml</code></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.convention.exclude.parentClassLoader"</span> <span class="na">value=</span><span class="s">"false"</span> <span class="nt">/&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.convention.exclude.parentClassLoader"</span> <span class="na">value=</span><span class="s">"false"</span> <span class="nt">/&gt;</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Thanks to <a href="http://stackoverflow.com/a/22490925/1805267">pavpal</a>!</p>
 
diff --git a/content/core-developers/httpheader-result.html b/content/core-developers/httpheader-result.html
index 2b39077..f49bbdd 100644
--- a/content/core-developers/httpheader-result.html
+++ b/content/core-developers/httpheader-result.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -147,7 +146,7 @@ can also be used to send an error to the client. All the parameters can be evalu
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span> <span class="na">type=</span><span class="s">"httpheader"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span> <span class="na">type=</span><span class="s">"httpheader"</span><span class="nt">&gt;</span>
   <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"status"</span><span class="nt">&gt;</span>204<span class="nt">&lt;/param&gt;</span>
   <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"headers.a"</span><span class="nt">&gt;</span>a custom header value<span class="nt">&lt;/param&gt;</span>
   <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"headers.b"</span><span class="nt">&gt;</span>another custom header value<span class="nt">&lt;/param&gt;</span>
@@ -157,8 +156,7 @@ can also be used to send an error to the client. All the parameters can be evalu
   <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"error"</span><span class="nt">&gt;</span>305<span class="nt">&lt;/param&gt;</span>
   <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"errorMessage"</span><span class="nt">&gt;</span>this action must be accessed through a proxy<span class="nt">&lt;/param&gt;</span>
 <span class="nt">&lt;/result&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/https-and-ie-issues.html b/content/core-developers/https-and-ie-issues.html
index 0069cfd..ca148c0 100644
--- a/content/core-developers/https-and-ie-issues.html
+++ b/content/core-developers/https-and-ie-issues.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -132,7 +131,7 @@
 
 <p> 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="highlighter-rouge"><pre class="highlight"><code>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>
 <span class="kn">package</span> <span class="n">org</span><span class="o">.</span><span class="na">tuxbot</span><span class="o">.</span><span class="na">ww</span><span class="o">.</span><span class="na">interceptor</span><span class="o">;</span>
 
 <span class="kn">import</span> <span class="nn">com.opensymphony.xwork.interceptor.AroundInterceptor</span><span class="o">;</span>
@@ -147,18 +146,17 @@
  */</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">HTTPRequestCachePrivateInterceptor</span> <span class="kd">extends</span> <span class="n">AroundInterceptor</span> <span class="o">{</span>
 
-    <span class="kd">protected</span> <span class="kt">void</span> <span class="n">after</span><span class="o">(</span><span class="n">ActionInvocation</span> <span class="n">actionInvocation</span><span class="o">,</span> <span class="n">String</span> <span class="n">string</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+    <span class="kd">protected</span> <span class="kt">void</span> <span class="nf">after</span><span class="o">(</span><span class="n">ActionInvocation</span> <span class="n">actionInvocation</span><span class="o">,</span> <span class="n">String</span> <span class="n">string</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
         <span class="c1">// Nothing</span>
     <span class="o">}</span>
 
-    <span class="kd">protected</span> <span class="kt">void</span> <span class="n">before</span><span class="o">(</span><span class="n">ActionInvocation</span> <span class="n">actionInvocation</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+    <span class="kd">protected</span> <span class="kt">void</span> <span class="nf">before</span><span class="o">(</span><span class="n">ActionInvocation</span> <span class="n">actionInvocation</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
         <span class="n">HttpServletResponse</span> <span class="n">res</span> <span class="o">=</span> <span class="o">(</span><span class="n">HttpServletResponse</span><span class="o">)</span> <span class="n">actionInvocation</span><span class="o">.</span><span class="na">getInvocationContext</span><span class="o">().</span><span class="na">get</span><span class="o">(</span><span class="n">ServletActionContext</span><span class="o">.</span><span class="na">HTTP_RESPONSE</span><span clas [...]
         <span class="n">res</span><span class="o">.</span><span class="na">setHeader</span><span class="o">(</span><span class="s">"CACHE-CONTROL"</span><span class="o">,</span> <span class="s">"PRIVATE"</span><span class="o">);</span>
     <span class="o">}</span>
 <span class="o">}</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/i18n-interceptor.html b/content/core-developers/i18n-interceptor.html
index d98b420..f7f9384 100644
--- a/content/core-developers/i18n-interceptor.html
+++ b/content/core-developers/i18n-interceptor.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -162,7 +161,7 @@ for the current request only, without saving it in the session. By default this
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;interceptor</span> <span class="na">name=</span><span class="s">"i18nCookie"</span> <span class="na">class=</span><span class="s">"org.apache.struts2.interceptor.I18nInterceptor"</span><span class="nt">/&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;interceptor</span> <span class="na">name=</span><span class="s">"i18nCookie"</span> <span class="na">class=</span><span class="s">"org.apache.struts2.interceptor.I18nInterceptor"</span><span class="nt">/&gt;</span>
 
 <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"someAction"</span> <span class="na">class=</span><span class="s">"com.examples.SomeAction"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"i18nCookie"</span><span class="nt">&gt;</span>
@@ -171,8 +170,7 @@ for the current request only, without saving it in the session. By default this
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"basicStack"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>good_result.ftl<span class="nt">&lt;/result&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/include-configuration.html b/content/core-developers/include-configuration.html
index 9a961f6..b54f0b3 100644
--- a/content/core-developers/include-configuration.html
+++ b/content/core-developers/include-configuration.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -133,7 +132,7 @@
 <p>A popular strategy is “divide and conquer”. The framework lets you apply “divide and conquer” to configuration files 
 using the <code class="highlighter-rouge">&lt;include .../&gt;</code> element.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="cp">&lt;!DOCTYPE struts PUBLIC
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="cp">&lt;!DOCTYPE struts PUBLIC
   "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
   "http://struts.apache.org/dtds/struts-2.0.dtd"&gt;</span>
 <span class="nt">&lt;struts&gt;</span>
@@ -143,8 +142,7 @@ using the <code class="highlighter-rouge">&lt;include .../&gt;</code> element.</
     <span class="nt">&lt;include</span> <span class="na">file=</span><span class="s">"/util/POJO.xml"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;include</span> <span class="na">file=</span><span class="s">"/com/initech/admin/admin-struts.xml"</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;/struts&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 <p>Each included file must be in the same format as <code class="highlighter-rouge">struts.xml</code>, including the <code class="highlighter-rouge">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>
 
diff --git a/content/core-developers/index.html b/content/core-developers/index.html
index 149f8f1..51687ee 100644
--- a/content/core-developers/index.html
+++ b/content/core-developers/index.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
diff --git a/content/core-developers/input-config-annotation.html b/content/core-developers/input-config-annotation.html
index d964d4b..2c0aecb 100644
--- a/content/core-developers/input-config-annotation.html
+++ b/content/core-developers/input-config-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -147,25 +146,24 @@
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">SampleAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="kd">public</span> <span class="kd">class</span> <span class="nc">SampleAction</span> <span class="kd">extends</span> <span class="n">ActionSupport</span> <span class="o">{</span>
 
-  <span class="kd">public</span> <span class="kt">void</span> <span class="n">isValid</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">ValidationException</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="kt">void</span> <span class="nf">isValid</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">ValidationException</span> <span class="o">{</span>
     <span class="c1">// validate model object, throw exception if failed</span>
   <span class="o">}</span>
 
   <span class="nd">@InputConfig</span><span class="o">(</span><span class="n">methodName</span><span class="o">=</span><span class="s">"input"</span><span class="o">)</span>
-  <span class="kd">public</span> <span class="n">String</span> <span class="n">execute</span><span class="o">()</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="n">String</span> <span class="nf">execute</span><span class="o">()</span> <span class="o">{</span>
      <span class="c1">// perform action</span>
      <span class="k">return</span> <span class="n">SUCCESS</span><span class="o">;</span>
   <span class="o">}</span>
-  <span class="kd">public</span> <span class="n">String</span> <span class="n">input</span><span class="o">()</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="n">String</span> <span class="nf">input</span><span class="o">()</span> <span class="o">{</span>
      <span class="c1">// perform some data filling</span>
      <span class="k">return</span> <span class="n">INPUT</span><span class="o">;</span>
   <span class="o">}</span>
  <span class="o">}</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/int-range-field-validator-annotation.html b/content/core-developers/int-range-field-validator-annotation.html
index 7bb032d..dda9a60 100644
--- a/content/core-developers/int-range-field-validator-annotation.html
+++ b/content/core-developers/int-range-field-validator-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -221,11 +220,10 @@ nothing will be done.</p>
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> <span class="nd">@IntRangeFieldValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span><span class="o">,</span> <span class="n" [...]
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nd">@IntRangeFieldValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span><sp [...]
 
  <span class="nd">@IntRangeFieldValidator</span><span class="o">(</span><span class="n">message</span> <span class="o">=</span> <span class="s">"Default message"</span><span class="o">,</span> <span class="n">key</span> <span class="o">=</span> <span class="s">"i18n.key"</span><span class="o">,</span> <span class="n">shortCircuit</span> <span class="o">=</span> <span class="kc">true</span><span class="o">,</span> <span class="n">minExpression</span> <span class="o">=</span> <span class=" [...]
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/int-validator.html b/content/core-developers/int-validator.html
index f2d0d4f..4ec2ae9 100644
--- a/content/core-developers/int-validator.html
+++ b/content/core-developers/int-validator.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -154,7 +153,7 @@ Do not use <code class="highlighter-rouge">${minExpression}</code> and <code cla
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;validators&gt;
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;validators&gt;
      &lt;!-- Plain Validator Syntax --&gt;
      &lt;validator type="int"&gt;
          &lt;param name="fieldName"&gt;age&lt;/param&gt;
@@ -181,8 +180,7 @@ Do not use <code class="highlighter-rouge">${minExpression}</code> and <code cla
          &lt;/field-validator&gt;
      &lt;/field&gt;
 &lt;/validators&gt;
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/interceptor-configuration.html b/content/core-developers/interceptor-configuration.html
index ba3ff37..a14d245 100644
--- a/content/core-developers/interceptor-configuration.html
+++ b/content/core-developers/interceptor-configuration.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -166,15 +165,14 @@ Interceptors, each class can be registered with the framework and given a unique
 
 <p><strong>Registering Interceptors</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;interceptors&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;interceptors&gt;</span>
   <span class="nt">&lt;interceptor</span> <span class="na">name=</span><span class="s">"security"</span> <span class="na">class=</span><span class="s">"com.company.security.SecurityInterceptor"</span><span class="nt">/&gt;</span>
   <span class="nt">&lt;interceptor-stack</span> <span class="na">name=</span><span class="s">"secureStack"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"security"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"defaultStack"</span><span class="nt">/&gt;</span>
   <span class="nt">&lt;/interceptor-stack&gt;</span>
 <span class="nt">&lt;/interceptors&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <blockquote>
   <p>Individual Interceptors and Interceptors Stacks can be “mixed and matched” in any order when defining an Interceptor Stack.</p>
@@ -189,12 +187,11 @@ but any action may also define its own local stack.</p>
 
 <p><strong>A local Interceptor Stack</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"VelocityCounter"</span> <span class="na">class=</span><span class="s">"org.apache.struts2.example.counter.SimpleCounter"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"VelocityCounter"</span> <span class="na">class=</span><span class="s">"org.apache.struts2.example.counter.SimpleCounter"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>...<span class="nt">&lt;/result&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"defaultComponentStack"</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>The default configuration - <a href="struts-default-xml.html">struts-default.xml</a>; sets up a default Interceptor Stack that 
 will work well for most applications.</p>
diff --git a/content/core-developers/interceptors.html b/content/core-developers/interceptors.html
index 68f0e25..29e063a 100644
--- a/content/core-developers/interceptors.html
+++ b/content/core-developers/interceptors.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -180,7 +179,7 @@ on the stack can be very important.</p>
 
 <p><strong>struts.xml</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"default"</span> <span class="na">extends=</span><span class="s">"struts-default"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"default"</span> <span class="na">extends=</span><span class="s">"struts-default"</span><span class="nt">&gt;</span>
    <span class="nt">&lt;interceptors&gt;</span>
        <span class="nt">&lt;interceptor</span> <span class="na">name=</span><span class="s">"timer"</span> <span class="na">class=</span><span class="s">".."</span><span class="nt">/&gt;</span>
        <span class="nt">&lt;interceptor</span> <span class="na">name=</span><span class="s">"logger"</span> <span class="na">class=</span><span class="s">".."</span><span class="nt">/&gt;</span>
@@ -193,8 +192,7 @@ on the stack can be very important.</p>
       <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span> <span class="na">type=</span><span class="s">"redirectAction"</span><span class="nt">&gt;</span>/secure/home<span class="nt">&lt;/result&gt;</span>
    <span class="nt">&lt;/action&gt;</span>
 <span class="nt">&lt;/package&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="stacking-interceptors">Stacking Interceptors</h2>
 
@@ -203,7 +201,7 @@ than reiterate the same list of Interceptors, we can bundle these Interceptors t
 
 <p><strong>struts.xml</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"default"</span> <span class="na">extends=</span><span class="s">"struts-default"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"default"</span> <span class="na">extends=</span><span class="s">"struts-default"</span><span class="nt">&gt;</span>
    <span class="nt">&lt;interceptors&gt;</span>
         <span class="nt">&lt;interceptor</span> <span class="na">name=</span><span class="s">"timer"</span> <span class="na">class=</span><span class="s">".."</span><span class="nt">/&gt;</span>
         <span class="nt">&lt;interceptor</span> <span class="na">name=</span><span class="s">"logger"</span> <span class="na">class=</span><span class="s">".."</span><span class="nt">/&gt;</span>
@@ -219,8 +217,7 @@ than reiterate the same list of Interceptors, we can bundle these Interceptors t
          <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span> <span class="na">type=</span><span class="s">"redirectAction"</span><span class="nt">&gt;</span>/secure/home<span class="nt">&lt;/result&gt;</span>
    <span class="nt">&lt;/action&gt;</span>
 <span class="nt">&lt;/package&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Looking inside <code class="highlighter-rouge">struts-default.xml</code>, we can see how it’s done.</p>
 
@@ -265,15 +262,15 @@ than reiterate the same list of Interceptors, we can bundle these Interceptors t
 <span class="nt">&lt;struts&gt;</span>
 
     <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.excludedClasses"</span>
-              <span class="na">value=</span><span class="s">"</span>
-                <span class="err">java.lang.Object,</span>
-                <span class="err">java.lang.Runtime,</span>
-                <span class="err">java.lang.System,</span>
-                <span class="err">java.lang.Class,</span>
-                <span class="err">java.lang.ClassLoader,</span>
-                <span class="err">java.lang.Shutdown,</span>
-                <span class="err">java.lang.ProcessBuilder,</span>
-                <span class="err">com.opensymphony.xwork2.ActionContext"</span> <span class="nt">/&gt;</span>
+              <span class="na">value=</span><span class="s">"
+                java.lang.Object,
+                java.lang.Runtime,
+                java.lang.System,
+                java.lang.Class,
+                java.lang.ClassLoader,
+                java.lang.Shutdown,
+                java.lang.ProcessBuilder,
+                com.opensymphony.xwork2.ActionContext"</span> <span class="nt">/&gt;</span>
 
     <span class="c">&lt;!-- this must be valid regex, each '.' in package name must be escaped! --&gt;</span>
     <span class="c">&lt;!-- it's more flexible but slower than simple string comparison --&gt;</span>
@@ -281,18 +278,18 @@ than reiterate the same list of Interceptors, we can bundle these Interceptors t
 
     <span class="c">&lt;!-- this is simpler version of the above used with string comparison --&gt;</span>
     <span class="nt">&lt;constant</span> <span class="na">name=</span><span class="s">"struts.excludedPackageNames"</span>
-              <span class="na">value=</span><span class="s">"</span>
-                <span class="err">ognl.,</span>
-                <span class="err">javax.,</span>
-                <span class="err">freemarker.core.,</span>
-                <span class="err">freemarker.template.,</span>
-                <span class="err">freemarker.ext.rhino.,</span>
-                <span class="err">sun.reflect.,</span>
-                <span class="err">javassist.,</span>
-                <span class="err">org.objectweb.asm.,</span>
-                <span class="err">com.opensymphony.xwork2.ognl.,</span>
-                <span class="err">com.opensymphony.xwork2.security.,</span>
-                <span class="err">com.opensymphony.xwork2.util."</span> <span class="nt">/&gt;</span>
+              <span class="na">value=</span><span class="s">"
+                ognl.,
+                javax.,
+                freemarker.core.,
+                freemarker.template.,
+                freemarker.ext.rhino.,
+                sun.reflect.,
+                javassist.,
+                org.objectweb.asm.,
+                com.opensymphony.xwork2.ognl.,
+                com.opensymphony.xwork2.security.,
+                com.opensymphony.xwork2.util."</span> <span class="nt">/&gt;</span>
 
     <span class="nt">&lt;bean</span> <span class="na">class=</span><span class="s">"com.opensymphony.xwork2.ObjectFactory"</span> <span class="na">name=</span><span class="s">"struts"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;bean</span> <span class="na">type=</span><span class="s">"com.opensymphony.xwork2.factory.ResultFactory"</span> <span class="na">name=</span><span class="s">"struts"</span> <span class="na">class=</span><span class="s">"org.apache.struts2.factory.StrutsResultFactory"</span> <span class="nt">/&gt;</span>
@@ -818,20 +815,24 @@ the hyphenated versions are not listed here, but might be referenced in prior ve
 <p><code class="highlighter-rouge">MethodFilterInterceptor</code> is an abstract <code class="highlighter-rouge">Interceptor</code> used as a base class for interceptors that will filter execution 
 based on method names according to specified included/excluded method lists.</p>
 
-<p>Settable parameters are as follows:
-- excludeMethods - method names to be excluded from interceptor processing
-- includeMethods - method names to be included in interceptor processing</p>
+<p>Settable parameters are as follows:</p>
+<ul>
+  <li>excludeMethods - method names to be excluded from interceptor processing</li>
+  <li>includeMethods - method names to be included in interceptor processing</li>
+</ul>
 
 <blockquote>
   <p>If method name are available in both includeMethods and excludeMethods, it will be considered as an included method: 
 includeMethods takes precedence over excludeMethods.</p>
 </blockquote>
 
-<p>Interceptors that extends this capability include:
-- <code class="highlighter-rouge">TokenInterceptor</code>
-- <code class="highlighter-rouge">TokenSessionStoreInterceptor</code>
-- <code class="highlighter-rouge">DefaultWorkflowInterceptor</code>
-- <code class="highlighter-rouge">ValidationInterceptor</code></p>
+<p>Interceptors that extends this capability include:</p>
+<ul>
+  <li><code class="highlighter-rouge">TokenInterceptor</code></li>
+  <li><code class="highlighter-rouge">TokenSessionStoreInterceptor</code></li>
+  <li><code class="highlighter-rouge">DefaultWorkflowInterceptor</code></li>
+  <li><code class="highlighter-rouge">ValidationInterceptor</code></li>
+</ul>
 
 <h2 id="interceptor-parameter-overriding">Interceptor Parameter Overriding</h2>
 
@@ -839,7 +840,7 @@ includeMethods takes precedence over excludeMethods.</p>
 
 <p><strong>Method 1</strong>:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"myAction"</span> <span class="na">class=</span><span class="s">"myActionClass"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"myAction"</span> <span class="na">class=</span><span class="s">"myActionClass"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"exception"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"alias"</span><span class="nt">/&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"params"</span><span class="nt">/&gt;</span>
@@ -859,19 +860,17 @@ includeMethods takes precedence over excludeMethods.</p>
         <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"excludeMethods"</span><span class="nt">&gt;</span>myWorkflowExcludeMethod<span class="nt">&lt;/param&gt;</span>
     <span class="nt">&lt;/interceptor-ref&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p><strong>Method 2</strong>:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"myAction"</span> <span class="na">class=</span><span class="s">"myActionClass"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"myAction"</span> <span class="na">class=</span><span class="s">"myActionClass"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"defaultStack"</span><span class="nt">&gt;</span>
         <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"validation.excludeMethods"</span><span class="nt">&gt;</span>myValidationExcludeMethod<span class="nt">&lt;/param&gt;</span>
         <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"workflow.excludeMethods"</span><span class="nt">&gt;</span>myWorkflowExcludeMethod<span class="nt">&lt;/param&gt;</span>
     <span class="nt">&lt;/interceptor-ref&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>In the first method, the whole default stack is copied and the parameter then changed accordingly.</p>
 
@@ -880,16 +879,15 @@ example, and override the <code class="highlighter-rouge">validator</code> and <
 tag, the name attribute contains a dot (.) the word before the dot(.) specifies the interceptor name whose parameter is 
 to be overridden and the word after the dot (.) specifies the parameter itself. The syntax is as follows:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>   &lt;interceptor-name&gt;.&lt;parameter-name&gt;
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>   &lt;interceptor-name&gt;.&lt;parameter-name&gt;
+</code></pre></div></div>
 
 <p>Note also that in this case the <code class="highlighter-rouge">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>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;interceptors&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;interceptors&gt;</span>
     <span class="nt">&lt;interceptor-stack</span> <span class="na">name=</span><span class="s">"parentStack"</span><span class="nt">&gt;</span>
         <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"defaultStack"</span><span class="nt">&gt;</span>
             <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"params.excludeParams"</span><span class="nt">&gt;</span>token<span class="nt">&lt;/param&gt;</span>
@@ -898,33 +896,30 @@ sense as if it is referring to the interceptor itself it would be just using Met
 <span class="nt">&lt;/interceptors&gt;</span>
 
 <span class="nt">&lt;default-interceptor-ref</span> <span class="na">name=</span><span class="s">"parentStack"</span><span class="nt">/&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="interceptor-parameter-overriding-inheritance">Interceptor Parameter Overriding Inheritance</h2>
 
 <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>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;interceptor-stack</span> <span class="na">name=</span><span class="s">"parentStack"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;interceptor-stack</span> <span class="na">name=</span><span class="s">"parentStack"</span><span class="nt">&gt;</span>
   <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"postPrepareParameterFilter"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"defaultBlock"</span><span class="nt">&gt;</span>true<span class="nt">&lt;/param&gt;</span>
   <span class="nt">&lt;/interceptor-ref&gt;</span>
 <span class="nt">&lt;/interceptor-stack&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>and an action overrides the “allowed” for “postPrepareParameterFilter”:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"child2"</span> <span class="na">namespace=</span><span class="s">"/child"</span> <span class="na">extends=</span><span class="s">"parentPackage"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;package</span> <span class="na">name=</span><span class="s">"child2"</span> <span class="na">namespace=</span><span class="s">"/child"</span> <span class="na">extends=</span><span class="s">"parentPackage"</span><span class="nt">&gt;</span>
   <span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"list"</span> <span class="na">class=</span><span class="s">"SomeAction"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"parentStack"</span><span class="nt">&gt;</span>
       <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"postPrepareParameterFilter.allowed"</span><span class="nt">&gt;</span>myObject.name<span class="nt">&lt;/param&gt;</span>
     <span class="nt">&lt;/interceptor-ref&gt;</span>
   <span class="nt">&lt;/action&gt;</span>
 <span class="nt">&lt;/package&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Then, only “allowed” will be overridden for the “postPrepareParameterFilter” interceptor in that action, 
 the other params will be null.</p>
@@ -940,16 +935,15 @@ in normal way.</p>
 
 <p>Params are evaluated as any other expression starting with from action as a top object.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"LazyFoo"</span> <span class="na">class=</span><span class="s">"com.opensymphony.xwork2.SimpleAction"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;action</span> <span class="na">name=</span><span class="s">"LazyFoo"</span> <span class="na">class=</span><span class="s">"com.opensymphony.xwork2.SimpleAction"</span><span class="nt">&gt;</span>
   <span class="nt">&lt;result</span> <span class="na">name=</span><span class="s">"success"</span><span class="nt">&gt;</span>result.jsp<span class="nt">&lt;/result&gt;</span>
   <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"lazy"</span><span class="nt">&gt;</span>
     <span class="nt">&lt;param</span> <span class="na">name=</span><span class="s">"foo"</span><span class="nt">&gt;</span>${bar}<span class="nt">&lt;/param&gt;</span>
   <span class="nt">&lt;/interceptor-ref&gt;</span>
 <span class="nt">&lt;/action&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>public class MockLazyInterceptor extends AbstractInterceptor implements WithLazyParams {
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code>public class MockLazyInterceptor extends AbstractInterceptor implements WithLazyParams {
 
     private String foo = "";
 
@@ -962,8 +956,7 @@ in normal way.</p>
         return invocation.invoke();
     }
 }
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Please be aware that order of interceptors can matter when want to access parameters passed via request as those 
 parameters are set by <a href="parameters-interceptor.html">Parameters Interceptor</a>.</p>
@@ -972,14 +965,13 @@ parameters are set by <a href="parameters-interceptor.html">Parameters Intercep
 
 <p>Interceptors provide an excellent means to wrap before/after processing. The concept reduces code duplication (think AOP).</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;interceptor-stack</span> <span class="na">name=</span><span class="s">"xaStack"</span><span class="nt">&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;interceptor-stack</span> <span class="na">name=</span><span class="s">"xaStack"</span><span class="nt">&gt;</span>
   <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"thisWillRunFirstInterceptor"</span><span class="nt">/&gt;</span>
   <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"thisWillRunNextInterceptor"</span><span class="nt">/&gt;</span>
   <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"followedByThisInterceptor"</span><span class="nt">/&gt;</span>
   <span class="nt">&lt;interceptor-ref</span> <span class="na">name=</span><span class="s">"thisWillRunLastInterceptor"</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;/interceptor-stack&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <blockquote>
   <p>Note that some Interceptors will interrupt the stack/chain/flow … so the order is very important.</p>
@@ -988,7 +980,7 @@ parameters are set by <a href="parameters-interceptor.html">Parameters Intercep
 <p>Interceptors implementing <code class="highlighter-rouge">com.opensymphony.xwork2.interceptor.PreResultListener</code> will run after the Action executes 
 but before the Result executes.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>thisWillRunFirstInterceptor
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>thisWillRunFirstInterceptor
   thisWillRunNextInterceptor
     followedByThisInterceptor
       thisWillRunLastInterceptor
@@ -1000,8 +992,7 @@ but before the Result executes.</p>
     followedByThisInterceptor
   thisWillRunNextInterceptor
 thisWillRunFirstInterceptor
-</code></pre>
-</div>
+</code></pre></div></div>
 
   </section>
 </article>
diff --git a/content/core-developers/jboss-5.html b/content/core-developers/jboss-5.html
index 3aec412..208b0a2 100644
--- a/content/core-developers/jboss-5.html
+++ b/content/core-developers/jboss-5.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -135,19 +134,17 @@
 <p>To have proper support of the <em>Convention Plugin</em>  in JBoss AS 5, especially when you put actions inside a jar (which is embedded in war or ear) and not directly into <code class="highlighter-rouge">WEB-INF/classes</code>, you must add the following line into <code class="highlighter-rouge">$JBOSS_HOME/bin/run.conf</code> or into <code class="highlighter-rouge">$JBOSS_HOME\bin\run.conf.bat</code>
 <strong>Linux/OSX - $JBOSS_HOME/bin/run.conf</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>
 JAVA_OPTS="$JAVA_OPTS -Djboss.vfs.forceVfsJar=true"
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p><strong>Windows - $JBOSS_HOME\bin\run.conf.bat</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>
 set "JAVA_OPTS=%JAVA_OPTS% -Djboss.vfs.forceVfsJar=true"
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>You can find more details about JBoss VFS <a href="http://docs\.jboss\.org/jbossas/docs/Installation\_And\_Getting\_Started\_Guide/5/html\_single/index\.html\#d0e495">here</a>^[http://docs.jboss.org/jbossas/docs/Installation_And_Getting_Started_Guide/5/html_single/index.html#d0e495].</p>
 
diff --git a/content/core-developers/key-annotation.html b/content/core-developers/key-annotation.html
index 232031c..46d20ef 100644
--- a/content/core-developers/key-annotation.html
+++ b/content/core-developers/key-annotation.html
@@ -86,7 +86,6 @@
                 <li><a href="/security/">Security Guide</a></li>
                 <li><a href="/core-developers/">Core Developers Guide</a></li>
                 <li><a href="/tag-developers/">Tag Developers Guide</a></li>
-                <li><a href="/migration/">Migration Guide</a></li>
                 <li><a href="/maven-archetypes/">Maven Archetypes</a></li>
                 <li><a href="/plugins/">Plugins</a></li>
                 <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
@@ -162,11 +161,10 @@
 
 <h2 id="examples">Examples</h2>
 
... 17173 lines suppressed ...


Mime
View raw message