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

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


The following commit(s) were added to refs/heads/asf-site by this push:
     new 0501f8045 Automatic Site Publish by Buildbot
0501f8045 is described below

commit 0501f8045c59ebfb8c9d5dc6a34f98a8361f8856
Author: buildbot <us...@infra.apache.org>
AuthorDate: Sat Apr 20 13:58:19 2024 +0000

    Automatic Site Publish by Buildbot
---
 output/core-developers/web-xml.html                |  13 +-
 output/plugins/async/index.html                    |   4 +-
 output/plugins/bean-validation/index.html          |   4 +-
 output/plugins/cdi/index.html                      |   4 +-
 output/plugins/codebehind/index.html               |   4 +-
 output/plugins/config-browser/index.html           |   4 +-
 output/plugins/convention/converting.html          |   6 +-
 output/plugins/convention/index.html               |   4 +-
 output/plugins/dwr/index.html                      |   4 +-
 output/plugins/embedded-jsp/index.html             |   4 +-
 output/plugins/index.html                          |   2 +-
 output/plugins/jasperreports/index.html            |   4 +-
 output/plugins/java-8-support/index.html           |   4 +-
 output/plugins/javatemplates/index.html            |   4 +-
 output/plugins/jfreechart/index.html               |   4 +-
 output/plugins/jsf/index.html                      |   4 +-
 output/plugins/json/index.html                     |   4 +-
 output/plugins/json/json-ajax-validation.html      |   4 +-
 output/plugins/junit/index.html                    |   4 +-
 output/plugins/osgi/index.html                     |   4 +-
 output/plugins/oval/index.html                     |   4 +-
 output/plugins/plexus/index.html                   |   4 +-
 output/plugins/portlet-tiles/index.html            |   4 +-
 output/plugins/portlet/index.html                  |   4 +-
 .../plugins/portlet/struts-2-portlet-tutorial.html |   4 +-
 output/plugins/rest/index.html                     |   4 +-
 output/plugins/sitegraph/index.html                |   4 +-
 output/plugins/sitemesh/index.html                 |  60 +++----
 output/plugins/spring/index.html                   |   6 +-
 .../spring-session-components-workarounds.html     | 192 ---------------------
 output/plugins/struts-1/index.html                 |   4 +-
 output/plugins/testng/index.html                   |   4 +-
 output/plugins/tiles-3/index.html                  |   4 +-
 output/plugins/tiles/index.html                    |   4 +-
 output/plugins/velocity/index.html                 |   2 +-
 35 files changed, 98 insertions(+), 295 deletions(-)

diff --git a/output/core-developers/web-xml.html 
b/output/core-developers/web-xml.html
index b1dee9200..4ed498a9b 100644
--- a/output/core-developers/web-xml.html
+++ b/output/core-developers/web-xml.html
@@ -160,10 +160,13 @@
 </ul>
 
 <p>The <code class="language-plaintext highlighter-rouge">web.xml</code> web 
application descriptor file represents the core of the Java web application, so 
it is appropriate 
-that it is also part of the core of the Struts framework. In the <code 
class="language-plaintext highlighter-rouge">web.xml</code> file, Struts 
defines its FilterDispatcher, 
-the Servlet Filter class that initializes the Struts framework and handles all 
requests. This filter can contain 
-initialization parameters that affect what, if any, additional configuration 
files are loaded and how the framework 
-should behave.</p>
+that it is also part of the core of the Struts framework. In the <code 
class="language-plaintext highlighter-rouge">web.xml</code> file you can use 
one of the two options:</p>
+<ol>
+  <li>Configure <code class="language-plaintext 
highlighter-rouge">org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</code>
 which acts as a central 
+  point of initializing the Struts framework and handles all requests.</li>
+  <li>Use combination of <code class="language-plaintext 
highlighter-rouge">org.apache.struts2.dispatcher.filter.StrutsPrepareFilter</code>
 and <code class="language-plaintext 
highlighter-rouge">org.apache.struts2.dispatcher.filter.StrutsExecuteFilter</code>
+  to support custom integration with other frameworks like Sitemesh.</li>
+</ol>
 
 <h2 id="simple-example">Simple Example</h2>
 
@@ -192,7 +195,7 @@ should behave.</p>
 <span class="nt">&lt;/web-app&gt;</span>
 </code></pre></div></div>
 
-<p>See <a href="../plugins/sitemesh-plugin">SiteMesh Plugin</a> for an example 
on when to use separate Filters for prepare and execution phase.</p>
+<p>See <a href="../plugins/sitemesh/">SiteMesh Plugin</a> for an example on 
when to use separate Filters for prepare and execution phase.</p>
 
 <h2 id="custom-mapping">Custom mapping</h2>
 
diff --git a/output/plugins/async/index.html b/output/plugins/async/index.html
index ed24ec747..a46dc1733 100644
--- a/output/plugins/async/index.html
+++ b/output/plugins/async/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/async/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="async-plugin">Async Plugin</h1>
 
diff --git a/output/plugins/bean-validation/index.html 
b/output/plugins/bean-validation/index.html
index 220bd6b7b..005fc7ae0 100644
--- a/output/plugins/bean-validation/index.html
+++ b/output/plugins/bean-validation/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/bean-validation/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="bean-validation-plugin">Bean Validation Plugin</h1>
 
diff --git a/output/plugins/cdi/index.html b/output/plugins/cdi/index.html
index d2afcacb6..285a0fd60 100644
--- a/output/plugins/cdi/index.html
+++ b/output/plugins/cdi/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/cdi/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="cdi-plugin">CDI Plugin</h1>
 
diff --git a/output/plugins/codebehind/index.html 
b/output/plugins/codebehind/index.html
index aff2be0e7..2a6b440b1 100644
--- a/output/plugins/codebehind/index.html
+++ b/output/plugins/codebehind/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/codebehind/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="codebehind-plugin">Codebehind Plugin</h1>
 
diff --git a/output/plugins/config-browser/index.html 
b/output/plugins/config-browser/index.html
index 09b0e079f..6a6447bd0 100644
--- a/output/plugins/config-browser/index.html
+++ b/output/plugins/config-browser/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/config-browser/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="config-browser-plugin">Config Browser Plugin</h1>
 
diff --git a/output/plugins/convention/converting.html 
b/output/plugins/convention/converting.html
index 3c77c4449..05106b01d 100644
--- a/output/plugins/convention/converting.html
+++ b/output/plugins/convention/converting.html
@@ -148,9 +148,9 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/convention/converting.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <p><a href="./">« back to Convention Plugin</a></p>
-
-<h1 
id="converting-application-from-codebehind-to-convention-plugin">Converting 
application from Codebehind to Convention Plugin</h1>
+    <a href="index" title="back to Convention plugin"><< back to Convention 
plugin</a>
+    
+    <h1 
id="converting-application-from-codebehind-to-convention-plugin">Converting 
application from Codebehind to Convention Plugin</h1>
 
 <h2 id="changes-required">Changes required</h2>
 
diff --git a/output/plugins/convention/index.html 
b/output/plugins/convention/index.html
index 8fd1df572..0fa087f96 100644
--- a/output/plugins/convention/index.html
+++ b/output/plugins/convention/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/convention/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="convention-plugin">Convention Plugin</h1>
 
diff --git a/output/plugins/dwr/index.html b/output/plugins/dwr/index.html
index 535ebe684..dac93da65 100644
--- a/output/plugins/dwr/index.html
+++ b/output/plugins/dwr/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/dwr/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="dwr-plugin">DWR Plugin</h1>
 
diff --git a/output/plugins/embedded-jsp/index.html 
b/output/plugins/embedded-jsp/index.html
index 3b1453a67..1ea4fcfe5 100644
--- a/output/plugins/embedded-jsp/index.html
+++ b/output/plugins/embedded-jsp/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/embedded-jsp/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="embedded-jsp-plugin">Embedded JSP Plugin</h1>
 
diff --git a/output/plugins/index.html b/output/plugins/index.html
index be2c2260b..4203c2c9a 100644
--- a/output/plugins/index.html
+++ b/output/plugins/index.html
@@ -283,7 +283,7 @@ to share with others. Several plugins are bundled with the 
framework, and others
     <tr>
       <td><a href="sitemesh">SiteMesh Plugin</a></td>
       <td> </td>
-      <td>deprecated since 6.0.0</td>
+      <td> </td>
     </tr>
     <tr>
       <td><a href="spring">Spring Plugin</a></td>
diff --git a/output/plugins/jasperreports/index.html 
b/output/plugins/jasperreports/index.html
index 3fefc615e..4eacce45e 100644
--- a/output/plugins/jasperreports/index.html
+++ b/output/plugins/jasperreports/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/jasperreports/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="jasperreports-plugin">JasperReports Plugin</h1>
 
diff --git a/output/plugins/java-8-support/index.html 
b/output/plugins/java-8-support/index.html
index 5bf2bf5ef..2c43f9ad6 100644
--- a/output/plugins/java-8-support/index.html
+++ b/output/plugins/java-8-support/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/java-8-support/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="java-8-support-plugin">Java 8 Support Plugin</h1>
 
diff --git a/output/plugins/javatemplates/index.html 
b/output/plugins/javatemplates/index.html
index 5a32572f9..9dda06dea 100644
--- a/output/plugins/javatemplates/index.html
+++ b/output/plugins/javatemplates/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/javatemplates/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="javatemplates-plugin">Javatemplates Plugin</h1>
 
diff --git a/output/plugins/jfreechart/index.html 
b/output/plugins/jfreechart/index.html
index 5a000596d..b776033c4 100644
--- a/output/plugins/jfreechart/index.html
+++ b/output/plugins/jfreechart/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/jfreechart/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="jfreechart-plugin">JFreeChart Plugin</h1>
 
diff --git a/output/plugins/jsf/index.html b/output/plugins/jsf/index.html
index f98f991ef..d32826c26 100644
--- a/output/plugins/jsf/index.html
+++ b/output/plugins/jsf/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/jsf/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="jsf-plugin">JSF Plugin</h1>
 
diff --git a/output/plugins/json/index.html b/output/plugins/json/index.html
index 42afd9ed8..e83d33603 100644
--- a/output/plugins/json/index.html
+++ b/output/plugins/json/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/json/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="json-plugin">JSON Plugin</h1>
 
diff --git a/output/plugins/json/json-ajax-validation.html 
b/output/plugins/json/json-ajax-validation.html
index 2ce7fea86..6e57e2003 100644
--- a/output/plugins/json/json-ajax-validation.html
+++ b/output/plugins/json/json-ajax-validation.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/json/json-ajax-validation.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="index.html" title="back to JSON plugin"><< back to JSON plugin</a>
+    <a href="index" title="back to JSON plugin"><< back to JSON plugin</a>
     
     <h1 class="no_toc" id="json-ajax-validation">JSON Ajax Validation</h1>
 
diff --git a/output/plugins/junit/index.html b/output/plugins/junit/index.html
index 8ef2f2eef..637675e3c 100644
--- a/output/plugins/junit/index.html
+++ b/output/plugins/junit/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/junit/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="junit-plugin">JUnit plugin</h1>
 
diff --git a/output/plugins/osgi/index.html b/output/plugins/osgi/index.html
index 518ab2f0d..522e5f010 100644
--- a/output/plugins/osgi/index.html
+++ b/output/plugins/osgi/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/osgi/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="osgi-plugin">OSGi Plugin</h1>
 
diff --git a/output/plugins/oval/index.html b/output/plugins/oval/index.html
index d99c796d6..dc86abff8 100644
--- a/output/plugins/oval/index.html
+++ b/output/plugins/oval/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/oval/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="oval-plugin">OVal Plugin</h1>
 
diff --git a/output/plugins/plexus/index.html b/output/plugins/plexus/index.html
index 03c455d60..c7a86e4da 100644
--- a/output/plugins/plexus/index.html
+++ b/output/plugins/plexus/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/plexus/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="plexus-plugin">Plexus Plugin</h1>
 
diff --git a/output/plugins/portlet-tiles/index.html 
b/output/plugins/portlet-tiles/index.html
index 714d4c183..421967eea 100644
--- a/output/plugins/portlet-tiles/index.html
+++ b/output/plugins/portlet-tiles/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/portlet-tiles/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="portlet-tiles-plugin">Portlet Tiles Plugin</h1>
 
diff --git a/output/plugins/portlet/index.html 
b/output/plugins/portlet/index.html
index 5be7d5e0d..409e6badc 100644
--- a/output/plugins/portlet/index.html
+++ b/output/plugins/portlet/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/portlet/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="portlet-plugin">Portlet Plugin</h1>
 
diff --git a/output/plugins/portlet/struts-2-portlet-tutorial.html 
b/output/plugins/portlet/struts-2-portlet-tutorial.html
index 40d89205a..ea922e13d 100644
--- a/output/plugins/portlet/struts-2-portlet-tutorial.html
+++ b/output/plugins/portlet/struts-2-portlet-tutorial.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/portlet/struts-2-portlet-tutorial.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="../" title="back to Plugins"><< back to Plugins</a>
+    <a href="index" title="back to Portlet Plugin"><< back to Portlet 
Plugin</a>
     
     <h1 id="struts-2-portlet-tutorial">Struts 2 Portlet Tutorial</h1>
 
diff --git a/output/plugins/rest/index.html b/output/plugins/rest/index.html
index 281b8ea1a..c98ee9331 100644
--- a/output/plugins/rest/index.html
+++ b/output/plugins/rest/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/rest/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="rest-plugin">REST Plugin</h1>
 
diff --git a/output/plugins/sitegraph/index.html 
b/output/plugins/sitegraph/index.html
index e3ebf9455..476447980 100644
--- a/output/plugins/sitegraph/index.html
+++ b/output/plugins/sitegraph/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/sitegraph/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="sitegraph-plugin">SiteGraph Plugin</h1>
 
diff --git a/output/plugins/sitemesh/index.html 
b/output/plugins/sitemesh/index.html
index d4b5e4f69..28e38c045 100644
--- a/output/plugins/sitemesh/index.html
+++ b/output/plugins/sitemesh/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/sitemesh/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="sitemesh-plugin">SiteMesh Plugin</h1>
 
@@ -156,7 +156,7 @@
   <li><a href="#about-sitemesh" id="markdown-toc-about-sitemesh">About 
SiteMesh</a></li>
   <li><a href="#features" id="markdown-toc-features">Features</a></li>
   <li><a href="#usage" id="markdown-toc-usage">Usage</a></li>
-  <li><a href="#freemarker--and-velocity-decorators" 
id="markdown-toc-freemarker--and-velocity-decorators">FreeMarker  and Velocity 
Decorators</a>    <ul>
+  <li><a href="#freemarker-and-velocity-decorators" 
id="markdown-toc-freemarker-and-velocity-decorators">FreeMarker and Velocity 
Decorators</a>    <ul>
       <li><a href="#freemarker" 
id="markdown-toc-freemarker">FreeMarker</a></li>
       <li><a href="#velocity" id="markdown-toc-velocity">Velocity</a></li>
       <li><a 
href="#full-integration-with-sitemesh-2--freemarker-242--velocity-13--including-struts-2-tags-valuestack-and-freemarkermanager-statics"
 
id="markdown-toc-full-integration-with-sitemesh-2--freemarker-242--velocity-13--including-struts-2-tags-valuestack-and-freemarkermanager-statics">Full
 integration with SiteMesh 2 + Freemarker 2.4.2 + Velocity 1.3 , including 
Struts 2 Tags, ValueStack, and FreemarkerManager statics.</a></li>
@@ -167,15 +167,12 @@
   <li><a href="#installation" 
id="markdown-toc-installation">Installation</a></li>
 </ul>
 
-<blockquote>
-  <p>This plugin got marked as deprecated since Struts 2.6!</p>
-</blockquote>
-
 <h2 id="about-sitemesh">About SiteMesh</h2>
 
 <blockquote>
   <p><a href="http://www.sitemesh.org/";>SiteMesh</a> is a web-page layout and 
decoration framework and web application integration 
-framework to aid in creating large sites consisting of many pages for which a 
consistent look/feel, navigation and layout scheme is required.</p>
+framework to aid in creating large sites consisting of many pages for which a 
consistent look/feel, navigation 
+and layout scheme is required.</p>
 </blockquote>
 
 <p>The Sitemesh plugin allows Sitemesh templates to access framework 
resources.</p>
@@ -194,7 +191,7 @@ with the framework. That’s it!</p>
 <h2 id="usage">Usage</h2>
 
 <p>From 2.2+ the new <code class="language-plaintext 
highlighter-rouge">com.opensymphony.sitemesh.webapp.SiteMeshFilter</code> 
filter 
-and Struts <code class="language-plaintext 
highlighter-rouge">org.apache.struts2.dispatcher.ng.listener.StrutsListener</code>
 context listener must be added to <code class="language-plaintext 
highlighter-rouge">web.xml</code>, like:</p>
+and Struts <code class="language-plaintext 
highlighter-rouge">org.apache.struts2.dispatcher.listener.StrutsListener</code> 
context listener must be added to <code class="language-plaintext 
highlighter-rouge">web.xml</code>, like:</p>
 
 <div class="language-xml highlighter-rouge"><div class="highlight"><pre 
class="highlight"><code><span class="nt">&lt;filter&gt;</span>
     <span class="nt">&lt;filter-name&gt;</span>sitemesh<span 
class="nt">&lt;/filter-name&gt;</span>
@@ -202,15 +199,15 @@ and Struts <code class="language-plaintext 
highlighter-rouge">org.apache.struts2
 <span class="nt">&lt;/filter&gt;</span> 
 ...
 <span class="nt">&lt;listener&gt;</span>
-    <span 
class="nt">&lt;listener-class&gt;</span>org.apache.struts2.dispatcher.ng.listener.StrutsListener<span
 class="nt">&lt;/listener-class&gt;</span>
+    <span 
class="nt">&lt;listener-class&gt;</span>org.apache.struts2.dispatcher.listener.StrutsListener<span
 class="nt">&lt;/listener-class&gt;</span>
 <span class="nt">&lt;/listener&gt;</span> 
 
 </code></pre></div></div>
 
-<h2 id="freemarker--and-velocity-decorators">FreeMarker  and Velocity 
Decorators</h2>
+<h2 id="freemarker-and-velocity-decorators">FreeMarker and Velocity 
Decorators</h2>
 
-<p>The plugin provides an extension of the SiteMesh <em>Velocity</em>  and 
<em>FreeMarker</em>  servlets. These servlets provide 
-the standard variables and <em>Struts Tags</em>  that you used to create views 
in your favourite template language.</p>
+<p>The plugin provides an extension of the SiteMesh <em>Velocity</em> and 
<em>FreeMarker</em> servlets. These servlets provide 
+the standard variables and <em>Struts Tags</em> that you used to create views 
in your favourite template language.</p>
 
 <h3 id="freemarker">FreeMarker</h3>
 
@@ -244,13 +241,12 @@ servlet, which can be configured like this in <code 
class="language-plaintext hi
 <p>From 2.2+ the recommended way to use Velocity with Sitemesh is through the 
<code class="language-plaintext 
highlighter-rouge">org.apache.struts2.sitemesh.VelocityDecoratorServlet</code> 
 servlet, which can be configured like this in <code class="language-plaintext 
highlighter-rouge">web.xml</code>:</p>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre 
class="highlight"><code>
-<span class="nt">&lt;servlet&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre 
class="highlight"><code><span class="nt">&lt;servlet&gt;</span>
     <span class="nt">&lt;servlet-name&gt;</span>sitemesh-freemarker<span 
class="nt">&lt;/servlet-name&gt;</span>
     <span 
class="nt">&lt;servlet-class&gt;</span>org.apache.struts2.sitemesh.VelocityDecoratorServlet<span
 class="nt">&lt;/servlet-class&gt;</span>
     <span class="nt">&lt;init-param&gt;</span>
-       <span class="nt">&lt;param-name&gt;</span>default_encoding<span 
class="nt">&lt;/param-name&gt;</span>
-       <span class="nt">&lt;param-value&gt;</span>UTF-8<span 
class="nt">&lt;/param-value&gt;</span>
+        <span class="nt">&lt;param-name&gt;</span>default_encoding<span 
class="nt">&lt;/param-name&gt;</span>
+        <span class="nt">&lt;param-value&gt;</span>UTF-8<span 
class="nt">&lt;/param-value&gt;</span>
     <span class="nt">&lt;/init-param&gt;</span>
     <span class="nt">&lt;load-on-startup&gt;</span>1<span 
class="nt">&lt;/load-on-startup&gt;</span>
 <span class="nt">&lt;/servlet&gt;</span> 
@@ -258,18 +254,16 @@ servlet, which can be configured like this in <code 
class="language-plaintext hi
 <span class="nt">&lt;servlet-mapping&gt;</span>
     <span class="nt">&lt;servlet-name&gt;</span>sitemesh-freemarker<span 
class="nt">&lt;/servlet-name&gt;</span>
     <span class="nt">&lt;url-pattern&gt;</span>*.ftl<span 
class="nt">&lt;/url-pattern&gt;</span>
-<span class="nt">&lt;/servlet-mapping&gt;</span> 
-
+<span class="nt">&lt;/servlet-mapping&gt;</span>
 </code></pre></div></div>
 
 <h3 
id="full-integration-with-sitemesh-2--freemarker-242--velocity-13--including-struts-2-tags-valuestack-and-freemarkermanager-statics">Full
 integration with SiteMesh 2 + Freemarker 2.4.2 + Velocity 1.3 , including 
Struts 2 Tags, ValueStack, and FreemarkerManager statics.</h3>
 
 <p>Such configuration is available as from Struts 2.2.0, please refer to <a 
href="https://issues.apache.org/jira/browse/WW-3296";>WW-3296</a> for me 
details.</p>
 
-<div class="language-xml highlighter-rouge"><div class="highlight"><pre 
class="highlight"><code>
-    <span class="nt">&lt;filter&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre 
class="highlight"><code>    <span class="nt">&lt;filter&gt;</span>
         <span class="nt">&lt;filter-name&gt;</span>struts-prepare<span 
class="nt">&lt;/filter-name&gt;</span>
-        <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter<span
 class="nt">&lt;/filter-class&gt;</span>
+        <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter<span
 class="nt">&lt;/filter-class&gt;</span>
     <span class="nt">&lt;/filter&gt;</span>
 
     <span class="nt">&lt;filter&gt;</span>
@@ -279,7 +273,7 @@ servlet, which can be configured like this in <code 
class="language-plaintext hi
 
     <span class="nt">&lt;filter&gt;</span>
         <span class="nt">&lt;filter-name&gt;</span>struts-execute<span 
class="nt">&lt;/filter-name&gt;</span>
-        <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter<span
 class="nt">&lt;/filter-class&gt;</span>
+        <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter<span
 class="nt">&lt;/filter-class&gt;</span>
     <span class="nt">&lt;/filter&gt;</span>
 
     <span class="nt">&lt;filter-mapping&gt;</span>
@@ -333,12 +327,12 @@ servlet, which can be configured like this in <code 
class="language-plaintext hi
 
 <div class="language-xml highlighter-rouge"><div class="highlight"><pre 
class="highlight"><code><span class="nt">&lt;filter&gt;</span>
     <span class="nt">&lt;filter-name&gt;</span>struts-prepare<span 
class="nt">&lt;/filter-name&gt;</span>
-    <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter<span
 class="nt">&lt;/filter-class&gt;</span>
+    <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter<span
 class="nt">&lt;/filter-class&gt;</span>
 <span class="nt">&lt;/filter&gt;</span>
 
 <span class="nt">&lt;filter&gt;</span>
     <span class="nt">&lt;filter-name&gt;</span>struts-execute<span 
class="nt">&lt;/filter-name&gt;</span>
-    <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter<span
 class="nt">&lt;/filter-class&gt;</span>
+    <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter<span
 class="nt">&lt;/filter-class&gt;</span>
 <span class="nt">&lt;/filter&gt;</span>
 
 
@@ -363,7 +357,7 @@ servlet, which can be configured like this in <code 
class="language-plaintext hi
 <span class="nt">&lt;/filter-mapping&gt;</span>
 
 <span class="nt">&lt;listener&gt;</span>
-    <span 
class="nt">&lt;listener-class&gt;</span>org.apache.struts2.dispatcher.ng.listener.StrutsListener<span
 class="nt">&lt;/listener-class&gt;</span>
+    <span 
class="nt">&lt;listener-class&gt;</span>org.apache.struts2.dispatcher.listener.StrutsListener<span
 class="nt">&lt;/listener-class&gt;</span>
 <span class="nt">&lt;/listener&gt;</span>
 
 <span class="nt">&lt;servlet&gt;</span>
@@ -402,12 +396,12 @@ servlet, which can be configured like this in <code 
class="language-plaintext hi
 
 <div class="language-xml highlighter-rouge"><div class="highlight"><pre 
class="highlight"><code><span class="nt">&lt;filter&gt;</span>
     <span class="nt">&lt;filter-name&gt;</span>struts-prepare<span 
class="nt">&lt;/filter-name&gt;</span>
-    <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter<span
 class="nt">&lt;/filter-class&gt;</span>
+    <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter<span
 class="nt">&lt;/filter-class&gt;</span>
 <span class="nt">&lt;/filter&gt;</span>
 
 <span class="nt">&lt;filter&gt;</span>
     <span class="nt">&lt;filter-name&gt;</span>struts-execute<span 
class="nt">&lt;/filter-name&gt;</span>
-    <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter<span
 class="nt">&lt;/filter-class&gt;</span>
+    <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter<span
 class="nt">&lt;/filter-class&gt;</span>
 <span class="nt">&lt;/filter&gt;</span>
 
 <span class="nt">&lt;filter&gt;</span>
@@ -429,15 +423,14 @@ servlet, which can be configured like this in <code 
class="language-plaintext hi
     <span class="nt">&lt;filter-name&gt;</span>struts-execute<span 
class="nt">&lt;/filter-name&gt;</span>
     <span class="nt">&lt;url-pattern&gt;</span>/*<span 
class="nt">&lt;/url-pattern&gt;</span>
 <span class="nt">&lt;/filter-mapping&gt;</span>
-
 </code></pre></div></div>
 
-<p>You do not need the struts2-sitmesh-plugin if you are using JSP for your 
decorators.
+<p>You do not need the Struts2 Sitmesh plugin if you are using JSP for your 
decorators.
 Here are the only changes needed to web.xml</p>
 
 <div class="language-xml highlighter-rouge"><div class="highlight"><pre 
class="highlight"><code><span class="nt">&lt;filter&gt;</span>
     <span class="nt">&lt;filter-name&gt;</span>struts2-prepare<span 
class="nt">&lt;/filter-name&gt;</span>
-    <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter<span
 class="nt">&lt;/filter-class&gt;</span>
+    <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter<span
 class="nt">&lt;/filter-class&gt;</span>
 <span class="nt">&lt;/filter&gt;</span>
 
 <span class="nt">&lt;filter&gt;</span>
@@ -447,7 +440,7 @@ Here are the only changes needed to web.xml</p>
 
 <span class="nt">&lt;filter&gt;</span>
     <span class="nt">&lt;filter-name&gt;</span>struts2-execute<span 
class="nt">&lt;/filter-name&gt;</span>
-    <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter<span
 class="nt">&lt;/filter-class&gt;</span>
+    <span 
class="nt">&lt;filter-class&gt;</span>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter<span
 class="nt">&lt;/filter-class&gt;</span>
 <span class="nt">&lt;/filter&gt;</span>
 
 <span class="nt">&lt;filter-mapping&gt;</span>
@@ -476,7 +469,8 @@ Here are the only changes needed to web.xml</p>
 
 <h2 id="installation">Installation</h2>
 
-<p>This plugin can be installed by copying the plugin jar into your 
application’s <code class="language-plaintext 
highlighter-rouge">/WEB-INF/lib</code> directory.  No other files need to be 
copied or created.</p>
+<p>This plugin can be installed by copying the plugin jar into your 
application’s <code class="language-plaintext 
highlighter-rouge">/WEB-INF/lib</code> directory.
+No other files need to be copied or created.</p>
 
   </section>
 </article>
diff --git a/output/plugins/spring/index.html b/output/plugins/spring/index.html
index 921337460..1bcef6a2c 100644
--- a/output/plugins/spring/index.html
+++ b/output/plugins/spring/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/spring/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="spring-plugin">Spring Plugin</h1>
 
@@ -360,8 +360,6 @@ Action did not need to be changed, because it can be 
autowired.</p>
 <span class="nt">&lt;/beans&gt;</span>
 </code></pre></div></div>
 
-<p>To use session-scoped components with Spring and Struts, see the <a 
href="spring-session-components-workarounds">Spring Session Components 
Workarounds</a> analysis.</p>
-
 <h2 id="class-reloading">Class Reloading</h2>
 
 <p>The Spring plugin can be configured to automatically reload classes that 
change in the file system. This feature will 
diff --git a/output/plugins/spring/spring-session-components-workarounds.html 
b/output/plugins/spring/spring-session-components-workarounds.html
deleted file mode 100644
index c491387d4..000000000
--- a/output/plugins/spring/spring-session-components-workarounds.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta name="Date-Revision-yyyymmdd" content="20140918"/>
-  <meta http-equiv="Content-Language" content="en"/>
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-
-  <title>Spring Session Components Workarounds</title>
-
-  <link 
href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic,600italic,700italic"
 rel="stylesheet" type="text/css">
-  <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
-  <link href="/css/main.css" rel="stylesheet">
-  <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
-
-  <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
-  <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
-  <script type="text/javascript" src="/js/community.js"></script>
-
-  <!-- Matomo -->
-  <script>
-    var _paq = window._paq = window._paq || [];
-    /* tracker methods like "setCustomDimension" should be called before 
"trackPageView" */
-    /* We explicitly disable cookie tracking to avoid privacy issues */
-    _paq.push(['disableCookies']);
-    _paq.push(['trackPageView']);
-    _paq.push(['enableLinkTracking']);
-    (function() {
-      var u="//analytics.apache.org/";
-      _paq.push(['setTrackerUrl', u+'matomo.php']);
-      _paq.push(['setSiteId', '41']);
-      var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
-      g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-    })();
-  </script>
-  <!-- End Matomo Code -->
-</head>
-<body>
-
-<a href="https://github.com/apache/struts"; class="github-ribbon">
-  <img decoding="async" loading="lazy" style="position: absolute; right: 0; 
border: 0;" width="149" height="149" 
src="https://github.blog/wp-content/uploads/2008/12/forkme_right_red_aa0000.png?resize=149%2C149";
 class="attachment-full size-full" alt="Fork me on GitHub" data-recalc-dims="1">
-</a>
-
-<header>
-  <nav>
-    <div role="navigation" class="navbar navbar-default navbar-fixed-top">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" data-toggle="collapse" 
data-target="#struts-menu" class="navbar-toggle">
-            Menu
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a href="/index.html" class="navbar-brand logo"><img 
src="/img/struts-logo.svg"></a>
-        </div>
-        <div id="struts-menu" class="navbar-collapse collapse">
-          <ul class="nav navbar-nav">
-            <li class="dropdown">
-              <a data-toggle="dropdown" href="#" class="dropdown-toggle">
-                Home<b class="caret"></b>
-              </a>
-              <ul class="dropdown-menu">
-                <li><a href="/index.html">Welcome</a></li>
-                <li><a href="/download.cgi">Download</a></li>
-                <li><a href="/releases.html">Releases</a></li>
-                <li><a href="/announce-2023.html">Announcements</a></li>
-                <li><a href="http://www.apache.org/licenses/";>License</a></li>
-                <li><a 
href="https://www.apache.org/foundation/thanks.html";>Thanks!</a></li>
-                <li><a 
href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
-                <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy 
Policy</a></li>
-              </ul>
-            </li>
-            <li class="dropdown">
-              <a data-toggle="dropdown" href="#" class="dropdown-toggle">
-                Support<b class="caret"></b>
-              </a>
-              <ul class="dropdown-menu">
-                <li><a href="/mail.html">User Mailing List</a></li>
-                <li><a href="https://issues.apache.org/jira/browse/WW";>Issue 
Tracker</a></li>
-                <li><a href="/security.html">Reporting Security Issues</a></li>
-                <li><a href="/commercial-support.html">Commercial 
Support</a></li>
-                <li class="divider"></li>
-                <li><a 
href="https://cwiki.apache.org/confluence/display/WW/Migration+Guide";>Version 
Notes</a></li>
-                <li><a 
href="https://cwiki.apache.org/confluence/display/WW/Security+Bulletins";>Security
 Bulletins</a></li>
-                <li class="divider"></li>
-                <li><a href="/maven/project-info.html">Maven Project 
Info</a></li>
-                <li><a href="/maven/struts2-core/dependencies.html">Struts 
Core Dependencies</a></li>
-                <li><a href="/maven/struts2-plugins/modules.html">Plugin 
Dependencies</a></li>
-              </ul>
-            </li>
-            <li class="dropdown">
-              <a data-toggle="dropdown" href="#" class="dropdown-toggle">
-                Documentation<b class="caret"></b>
-              </a>
-              <ul class="dropdown-menu">
-                <li><a href="/birdseye.html">Birds Eye</a></li>
-                <li><a href="/primer.html">Key Technologies</a></li>
-                <li><a href="/kickstart.html">Kickstart FAQ</a></li>
-                <li><a 
href="https://cwiki.apache.org/confluence/display/WW/Home";>Wiki</a></li>
-                <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started</a></li>
-                <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="/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>
-                <li><a href="/tag-developers/tag-reference.html">Tag 
reference</a></li>
-                <li><a 
href="https://cwiki.apache.org/confluence/display/WW/FAQs";>FAQs</a></li>
-                <li><a 
href="http://cwiki.apache.org/S2PLUGINS/home.html";>Plugin registry</a></li>
-              </ul>
-            </li>
-            <li class="dropdown">
-              <a data-toggle="dropdown" href="#" class="dropdown-toggle">
-                Contributing<b class="caret"></b>
-              </a>
-              <ul class="dropdown-menu">
-                <li><a href="/youatstruts.html">You at Struts</a></li>
-                <li><a href="/helping.html">How to Help FAQ</a></li>
-                <li><a href="/dev-mail.html">Development Lists</a></li>
-                <li class="divider"></li>
-                <li><a href="/submitting-patches.html">Submitting 
patches</a></li>
-                <li><a href="/builds.html">Source Code and Builds</a></li>
-                <li><a href="/coding-standards.html">Coding standards</a></li>
-                <li><a href="/contributors/">Contributors Guide</a></li>
-                <li class="divider"></li>
-                <li><a href="/release-guidelines.html">Release 
Guidelines</a></li>
-                <li><a href="/bylaws.html">PMC Charter</a></li>
-                <li><a href="/volunteers.html">Volunteers</a></li>
-                <li><a 
href="https://gitbox.apache.org/repos/asf?p=struts.git";>Source 
Repository</a></li>
-                <li><a href="/updating-website.html">Updating the 
website</a></li>
-              </ul>
-            </li>
-            <li class="apache"><a href="http://www.apache.org/";><img 
src="/img/apache.png"></a></li>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </nav>
-</header>
-
-
-<article class="container">
-  <section class="col-md-12">
-    <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/spring/spring-session-components-workarounds.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
-    
-    <a href="../" title="back to Plugins"><< back to Plugins</a>
-    
-    <h1 id="spring-session-components-workarounds">Spring Session Components 
Workarounds</h1>
-
-  </section>
-</article>
-
-
-<footer class="container">
-  <div class="col-md-12">
-    Copyright &copy; 2000-2022 <a href="https://www.apache.org/";>The Apache 
Software Foundation</a>.
-    Apache Struts, Struts, Apache, the Apache feather logo, and the Apache 
Struts project logos are
-    trademarks of The Apache Software Foundation. All Rights Reserved.
-  </div>
-  <div class="col-md-12">Logo and website design donated by <a 
href="https://softwaremill.com/";>SoftwareMill</a>.</div>
-</footer>
-
-<script>!function (d, s, id) {
-  var js, fjs = d.getElementsByTagName(s)[0];
-  if (!d.getElementById(id)) {
-    js = d.createElement(s);
-    js.id = id;
-    js.src = "//platform.twitter.com/widgets.js";
-    fjs.parentNode.insertBefore(js, fjs);
-  }
-}(document, "script", "twitter-wjs");</script>
-<script src="https://apis.google.com/js/platform.js"; async="async" 
defer="defer"></script>
-
-<div id="fb-root"></div>
-
-<script>(function (d, s, id) {
-  var js, fjs = d.getElementsByTagName(s)[0];
-  if (d.getElementById(id)) return;
-  js = d.createElement(s);
-  js.id = id;
-  js.src = "//connect.facebook.net/en_GB/all.js#xfbml=1";
-  fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));</script>
-
-
-</body>
-</html>
diff --git a/output/plugins/struts-1/index.html 
b/output/plugins/struts-1/index.html
index bcc33a9f8..b7f853b4c 100644
--- a/output/plugins/struts-1/index.html
+++ b/output/plugins/struts-1/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/struts-1/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="struts-1-plugin">Struts 1 Plugin</h1>
 
diff --git a/output/plugins/testng/index.html b/output/plugins/testng/index.html
index c646e03e5..957179def 100644
--- a/output/plugins/testng/index.html
+++ b/output/plugins/testng/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/testng/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="testng-plugin">TestNG Plugin</h1>
 
diff --git a/output/plugins/tiles-3/index.html 
b/output/plugins/tiles-3/index.html
index 7ed3acfe2..15eff0628 100644
--- a/output/plugins/tiles-3/index.html
+++ b/output/plugins/tiles-3/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/tiles-3/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="tiles-3-plugin">Tiles 3 Plugin</h1>
 
diff --git a/output/plugins/tiles/index.html b/output/plugins/tiles/index.html
index c75e28b8f..00fd0fd18 100644
--- a/output/plugins/tiles/index.html
+++ b/output/plugins/tiles/index.html
@@ -13,7 +13,7 @@
   <link 
href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" 
rel="stylesheet">
   <link href="/css/main.css" rel="stylesheet">
   <link href="/css/custom.css" rel="stylesheet">
-  <link href="/highlighter/github-theme.css" rel="stylesheet">
+  <link href="/css/syntax.css" rel="stylesheet">
 
   <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/tiles/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 class="no_toc" id="tiles-plugin">Tiles Plugin</h1>
 
diff --git a/output/plugins/velocity/index.html 
b/output/plugins/velocity/index.html
index 2ef2b906f..fe505d4ca 100644
--- a/output/plugins/velocity/index.html
+++ b/output/plugins/velocity/index.html
@@ -148,7 +148,7 @@
   <section class="col-md-12">
     <a class="edit-on-gh" 
href="https://github.com/apache/struts-site/edit/master/source/plugins/velocity/index.md";
 title="Edit this page on GitHub">Edit on GitHub</a>
     
-    <a href="/plugins" title="back to Plugins"><< back to Plugins</a>
+    <a href="../" title="back to Plugins"><< back to Plugins</a>
     
     <h1 id="velocity-plugin">Velocity Plugin</h1>
 

Reply via email to