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-site updated: Updates production by Jenkins
Date Wed, 27 Sep 2017 18:25:28 GMT
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 0a0b0f4  Updates production by Jenkins
0a0b0f4 is described below

commit 0a0b0f44a9a9f438f3bc96ed1b0719f52c9150c4
Author: jenkins <builds@apache.org>
AuthorDate: Wed Sep 27 18:25:26 2017 +0000

    Updates production by Jenkins
---
 content/core-developers/action-mapper.html         |   46 +-
 content/core-developers/after-annotation.html      |   46 +-
 content/core-developers/alias-interceptor.html     |   45 +-
 .../annotation-workflow-interceptor.html           |   60 +-
 content/core-developers/basic-validation.html      |   24 +-
 content/core-developers/before-annotation.html     |   45 +-
 .../core-developers/before-result-annotation.html  |   45 +-
 content/core-developers/checkbox-interceptor.html  |   10 +-
 content/core-developers/client-validation.html     |   24 +-
 content/core-developers/conversion-annotation.html |   56 +-
 ...onversion-error-field-validator-annotation.html |   64 +-
 .../conversion-error-interceptor.html              |   56 +-
 content/core-developers/cookie-interceptor.html    |  133 +-
 .../cookie-provider-interceptor.html               |   34 +-
 .../core-developers/create-if-null-annotation.html |   38 +-
 .../create-session-interceptor.html                |   43 +-
 .../custom-validator-annotation.html               |   63 +-
 .../date-range-field-validator-annotation.html     |  101 +-
 content/core-developers/debugging-interceptor.html |   34 +-
 .../default-workflow-interceptor.html              |  105 +-
 .../double-range-field-validator-annotation.html   |  116 +-
 content/core-developers/element-annotation.html    |   29 +-
 .../email-validator-annotation.html                |   63 +-
 content/core-developers/exception-interceptor.html |   71 +-
 .../execute-and-wait-interceptor.html              |  132 +-
 .../expression-validator-annotation.html           |   57 +-
 .../field-expression-validator-annotation.html     |   65 +-
 .../core-developers/file-upload-interceptor.html   |  131 +-
 content/core-developers/file-upload.html           |   11 +-
 .../core-developers/input-config-annotation.html   |   55 +-
 .../int-range-field-validator-annotation.html      |  100 +-
 content/core-developers/key-annotation.html        |   39 +-
 .../core-developers/key-property-annotation.html   |   40 +-
 content/core-developers/logger-interceptor.html    |   36 +-
 .../parameter-filter-interceptor.html              |   44 +-
 content/core-developers/postback-result.html       |   16 +-
 content/core-developers/prepare-interceptor.html   |   76 +-
 .../pure-java-script-client-side-validation.html   |    4 +-
 .../core-developers/redirect-action-result.html    |   88 +-
 content/core-developers/redirect-result.html       |   48 +-
 .../regex-field-validator-annotation.html          |   69 +-
 .../required-field-validator-annotation.html       |   63 +-
 .../required-string-validator-annotation.html      |   69 +-
 content/core-developers/roles-interceptor.html     |   33 +-
 content/core-developers/scope-interceptor.html     |   99 +-
 .../scoped-model-driven-interceptor.html           |   47 +-
 .../servlet-config-interceptor.html                |   62 +-
 .../static-parameters-interceptor.html             |   40 +-
 .../string-length-field-validator-annotation.html  |   97 +-
 content/core-developers/timer-interceptor.html     |   47 +-
 content/core-developers/token-interceptor.html     |   75 +-
 .../core-developers/token-session-interceptor.html |   58 +-
 .../type-conversion-annotation.html                |  115 +-
 .../core-developers/using-field-validators.html    |   24 +-
 .../using-non-field-validators.html                |   24 +-
 .../using-visitor-field-validator.html             |   24 +-
 content/core-developers/validation-annotation.html |   94 +-
 .../core-developers/validation-interceptor.html    |   91 +-
 .../validation-parameter-annotation.html           |   43 +-
 .../core-developers/validations-annotation.html    |  123 +-
 content/core-developers/velocity-result.html       |   16 +-
 .../visitor-field-validator-annotation.html        |   76 +-
 content/tag-developers/action-tag.html             |   60 +-
 content/tag-developers/actionerror-tag.html        |   25 +-
 content/tag-developers/actionmessage-tag.html      |   23 +-
 content/tag-developers/ajax-common-header.html     | 1362 ++++++++++++++------
 content/tag-developers/append-tag.html             |   78 +-
 content/tag-developers/bean-tag.html               |   51 +-
 content/tag-developers/checkbox-tag.html           |   24 +-
 content/tag-developers/checkboxlist-tag.html       |   32 +-
 content/tag-developers/combobox-tag.html           |   63 +-
 content/tag-developers/component-tag.html          |  102 +-
 content/tag-developers/date-tag.html               |  110 +-
 content/tag-developers/datetextfield-tag.html      |   16 +-
 content/tag-developers/div-tag.html                |    8 +-
 content/tag-developers/dojo-a-tag.html             |   56 +-
 content/tag-developers/dojo-autocompleter-tag.html |   80 +-
 content/tag-developers/dojo-bind-tag.html          |   56 +-
 .../tag-developers/dojo-datetimepicker-tag.html    |   32 +-
 content/tag-developers/dojo-div-tag.html           |   32 +-
 content/tag-developers/dojo-head-tag.html          |   36 +-
 content/tag-developers/dojo-submit-tag.html        |   80 +-
 content/tag-developers/dojo-tabbedpanel-tag.html   |   24 +-
 content/tag-developers/dojo-textarea-tag.html      |    8 +-
 content/tag-developers/dojo-tree-tag.html          |   32 +-
 content/tag-developers/dojo-treenode-tag.html      |   16 +-
 content/tag-developers/doubleselect-tag.html       |   31 +-
 content/tag-developers/else-tag.html               |   27 +-
 content/tag-developers/elseif-tag.html             |   27 +-
 content/tag-developers/fielderror-tag.html         |   52 +-
 content/tag-developers/file-tag.html               |   17 +-
 content/tag-developers/form-tag.html               |   46 +-
 content/tag-developers/form-tags.html              |  382 +++++-
 content/tag-developers/generator-tag.html          |   87 +-
 content/tag-developers/head-tag.html               |   20 +-
 content/tag-developers/hidden-tag.html             |   24 +-
 content/tag-developers/i18n-tag.html               |   24 +-
 content/tag-developers/if-tag.html                 |   12 +-
 content/tag-developers/include-tag.html            |   44 +-
 .../tag-developers/inputtransferselect-tag.html    |   43 +-
 content/tag-developers/iterator-tag.html           |  178 ++-
 content/tag-developers/label-tag.html              |   27 +-
 content/tag-developers/merge-tag.html              |   89 +-
 content/tag-developers/optgroup-tag.html           |   40 +-
 .../tag-developers/optiontransferselect-tag.html   |   73 +-
 content/tag-developers/param-tag.html              |   71 +-
 content/tag-developers/password-tag.html           |   27 +-
 content/tag-developers/property-tag.html           |   36 +-
 content/tag-developers/push-tag.html               |   94 +-
 content/tag-developers/radio-tag.html              |   47 +-
 content/tag-developers/reset-tag.html              |   32 +-
 content/tag-developers/select-tag.html             |   55 +-
 content/tag-developers/set-tag.html                |   39 +-
 content/tag-developers/sort-tag.html               |   41 +-
 content/tag-developers/submit-tag.html             |   16 +-
 content/tag-developers/subset-tag.html             |  115 +-
 content/tag-developers/text-tag.html               |   54 +-
 content/tag-developers/textarea-tag.html           |   16 +-
 content/tag-developers/textfield-tag.html          |   24 +-
 content/tag-developers/token-tag.html              |   21 +-
 content/tag-developers/updownselect-tag.html       |   56 +-
 content/tag-developers/url-tag.html                |   51 +-
 122 files changed, 6701 insertions(+), 1425 deletions(-)

diff --git a/content/core-developers/action-mapper.html b/content/core-developers/action-mapper.html
index e47e7b0..3caf2a7 100644
--- a/content/core-developers/action-mapper.html
+++ b/content/core-developers/action-mapper.html
@@ -430,14 +430,52 @@
 
 <p>####PrefixBasedActionMapper####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ A prefix based action mapper that is capable of delegating to other {@link ActionMapper}s based on the request's prefix.&lt;br&gt;
+ It is configured through struts.xml&lt;br&gt;
+ For example, with the following entries in struts.properties
+ &lt;/p&gt;
+
+ &lt;pre&gt;
+ &amp;lt;constant name="struts.mapper.class" value="org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper"/&amp;gt;
+ &amp;lt;constant name="struts.mapper.prefixMapping" value="/communities:pseudoRestful,/communityTags:pseudoRestful,/events:pseudoRestful,/mediaList:pseudoRestful,/users:pseudoRestful,/community:struts,/communityTag:struts,/event:struts,/media:struts,/user:struts,:struts"/&amp;gt;
+ &lt;/pre&gt;
+
+ &lt;p&gt;
+ When {@link PrefixBasedActionMapper#getMapping(HttpServletRequest, ConfigurationManager)} or
+ {@link PrefixBasedActionMapper#getUriFromActionMapping(ActionMapping)} is invoked,
+ {@link PrefixBasedActionMapper} will check each possible prefix (url prefix terminating just before a /) to find the most specific ActionMapper that returns a mapping when asked to map the request.  If none are found, null is returned for both
+ {@link PrefixBasedActionMapper#getMapping(HttpServletRequest, ConfigurationManager)} and
+ {@link PrefixBasedActionMapper#getUriFromActionMapping(ActionMapping)} methods.
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p><strong>PrefixBasedActionProxyFactory</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.factory.PrefixBasedActionProxyFactory</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Prefix based factory should be used with {@link org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper}
+ to use appropriate {@link com.opensymphony.xwork2.ActionProxyFactory} connected with given
+ {@link org.apache.struts2.dispatcher.mapper.ActionMapper}
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ Add below entry to struts.xml to enable the factory:
+ &lt;/p&gt;
+
+ &lt;pre&gt;
+ &amp;lt;constant name="struts.actionProxyFactory" value="prefix"/&amp;gt;
+ &lt;/pre&gt;
+
+ &lt;p&gt;
+ The factory will use the same set of patterns as defined with:
+ &lt;/p&gt;
+
+ &lt;pre&gt;
+ &amp;lt;constant name="struts.mapper.prefixMapping" value="..."/&amp;gt;
+ &lt;/pre&gt;
+</code></pre>
 </div>
 
 <p>####ActionMapper and ActionMapping objects####</p>
diff --git a/content/core-developers/after-annotation.html b/content/core-developers/after-annotation.html
index 7ff3ee4..ee4bf32 100644
--- a/content/core-developers/after-annotation.html
+++ b/content/core-developers/after-annotation.html
@@ -131,26 +131,56 @@
 
 <p>####After Annotation####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.After</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Marks a action method that needs to be called after the main action method and the result was
+ executed. Return value is ignored.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.After</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> The After annotation can be applied at method level.
+
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.After</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;priority&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;10&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Priority order of method execution&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.interceptor.annotations.After</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ public class SampleAction extends ActionSupport {
+
+  &amp;#64;After
+  public void isValid() throws ValidationException {
+    // validate model object, throw exception if failed
+  }
+
+  public String execute() {
+     // perform action
+     return SUCCESS;
+  }
+ }
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/alias-interceptor.html b/content/core-developers/alias-interceptor.html
index 0824ccf..4a96cd4 100644
--- a/content/core-developers/alias-interceptor.html
+++ b/content/core-developers/alias-interceptor.html
@@ -129,26 +129,55 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/alias-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="alias-interceptor">Alias Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.AliasInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ The aim of this Interceptor is to alias a named parameter to a different named parameter. By acting as the glue
+ between actions sharing similar parameters (but with different names), it can help greatly with action chaining.
+
+ &lt;p&gt;Action's alias expressions should be in the form of  &lt;code&gt;#{ "name1" : "alias1", "name2" : "alias2" }&lt;/code&gt;.
+ This means that assuming an action (or something else in the stack) has a value for the expression named &lt;i&gt;name1&lt;/i&gt; and the
+ action this interceptor is applied to has a setter named &lt;i&gt;alias1&lt;/i&gt;, &lt;i&gt;alias1&lt;/i&gt; will be set with the value from
+ &lt;i&gt;name1&lt;/i&gt;.
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.AliasInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;aliasesKey (optional) - the name of the action parameter to look for the alias map (by default this is
+ &lt;i&gt;aliases&lt;/i&gt;).&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=com.opensymphony.xwork2.interceptor.AliasInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ This interceptor does not have any known extension points.
+
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=com.opensymphony.xwork2.interceptor.AliasInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;!-- The value for the foo parameter will be applied as if it were named bar --&amp;gt;
+     &amp;lt;param name="aliases"&amp;gt;#{ 'foo' : 'bar' }&amp;lt;/param&amp;gt;
+
+     &amp;lt;interceptor-ref name="alias"/&amp;gt;
+     &amp;lt;interceptor-ref name="basicStack"/&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/annotation-workflow-interceptor.html b/content/core-developers/annotation-workflow-interceptor.html
index b66adb1..fa55ea4 100644
--- a/content/core-developers/annotation-workflow-interceptor.html
+++ b/content/core-developers/annotation-workflow-interceptor.html
@@ -129,14 +129,61 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/annotation-workflow-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="annotationworkflowinterceptor">AnnotationWorkflowInterceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.AnnotationWorkflowInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Invokes any annotated methods on the action. Specifically, it supports the following
+ annotations:&lt;/p&gt;
+ &lt;ul&gt;
+ &lt;li&gt; &amp;#64;{@link Before} - will be invoked before the action method. If the returned value is not null, it is
+ returned as the action result code&lt;/li&gt;
+ &lt;li&gt; &amp;#64;{@link BeforeResult} - will be invoked after the action method but before the result execution&lt;/li&gt;
+ &lt;li&gt; &amp;#64;{@link After} - will be invoked after the action method and result execution&lt;/li&gt;
+ &lt;/ul&gt;
+
+ &lt;p&gt;There can be multiple methods marked with the same annotations, but the order of their execution
+ is not guaranteed. However, the annotated methods on the superclass chain are guaranteed to be invoked before the
+ annotated method in the current class in the case of a {@link Before} annotations and after, if the annotations is
+ {@link After}.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javacode|javadoc=true|lang=java|url=com.opensymphony.xwork2.interceptor.annotations.AnnotationWorkflowInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+  public class BaseAnnotatedAction {
+  	protected String log = "";
+
+  	&amp;#64;Before
+  	public String baseBefore() {
+  		log = log + "baseBefore-";
+  		return null;
+  	}
+  }
+
+  public class AnnotatedAction extends BaseAnnotatedAction {
+  	&amp;#64;Before
+  	public String before() {
+  		log = log + "before";
+  		return null;
+  	}
+
+  	public String execute() {
+  		log = log + "-execute";
+  		return Action.SUCCESS;
+  	}
+
+  	&amp;#64;BeforeResult
+  	public void beforeResult() throws Exception {
+  		log = log +"-beforeResult";
+  	}
+
+  	&amp;#64;After
+  	public void after() {
+  		log = log + "-after";
+  	}
+  }
+```
+
+</code></pre>
 </div>
 
 <p>Configure a stack in struts.xml that replaces the PrepareInterceptor with the AnnotationWorkflowInterceptor:</p>
@@ -163,8 +210,9 @@
 </code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.AnnotationWorkflowInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;With the interceptor applied and the action executed on &lt;code&gt;AnnotatedAction&lt;/code&gt; the log
+ instance variable will contain &lt;code&gt;baseBefore-before-execute-beforeResult-after&lt;/code&gt;.&lt;/p&gt;
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/basic-validation.html b/content/core-developers/basic-validation.html
index f03bacc..9c97958 100644
--- a/content/core-developers/basic-validation.html
+++ b/content/core-developers/basic-validation.html
@@ -135,16 +135,24 @@
 
 <p>Create the input form.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=basicValidation|javadoc=false|lang=xml|url=struts2/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-basic.jsp</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: basicValidation not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-basic/jsp.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>#####Step 2#####</p>
 
 <p>Create the Action class.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=quizAction|javadoc=false|lang=java|url=struts2/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+START SNIPPET: quizAction not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>#####Step 3#####</p>
@@ -166,8 +174,12 @@
 </div>
 <p>.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=quizValidators|javadoc=false|lang=xml|url=struts2/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: quizValidators not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation/xml.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>#####Step 4#####</p>
diff --git a/content/core-developers/before-annotation.html b/content/core-developers/before-annotation.html
index 110afef..2f4110e 100644
--- a/content/core-developers/before-annotation.html
+++ b/content/core-developers/before-annotation.html
@@ -131,26 +131,55 @@
 
 <p>####Before Annotation####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.Before</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Marks a action method that needs to be executed before the main action method.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.Before</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> The Before annotation can be applied at method level.
+
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.Before</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;priority&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;10&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Priority order of method execution&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.interceptor.annotations.Before</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ public class SampleAction extends ActionSupport {
+
+  &amp;#64;Before
+  public void isAuthorized() throws AuthenticationException {
+    // authorize request, throw exception if failed
+  }
+
+  public String execute() {
+     // perform secure action
+     return SUCCESS;
+  }
+ }
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/before-result-annotation.html b/content/core-developers/before-result-annotation.html
index 88cca21..861efb2 100644
--- a/content/core-developers/before-result-annotation.html
+++ b/content/core-developers/before-result-annotation.html
@@ -131,26 +131,55 @@
 
 <p>####BeforeResult Annotation####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.BeforeResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Marks a action method that needs to be executed before the result. Return value is ignored.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.BeforeResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> The BeforeResult annotation can be applied at method level.
+
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.BeforeResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;priority&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;10&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Priority order of method execution&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.interceptor.annotations.BeforeResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ public class SampleAction extends ActionSupport {
+
+  &amp;#64;BeforeResult
+  public void isValid() throws ValidationException {
+    // validate model object, throw exception if failed
+  }
+
+  public String execute() {
+     // perform action
+     return SUCCESS;
+  }
+ }
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/checkbox-interceptor.html b/content/core-developers/checkbox-interceptor.html
index dd85bed..0a65554 100644
--- a/content/core-developers/checkbox-interceptor.html
+++ b/content/core-developers/checkbox-interceptor.html
@@ -168,14 +168,16 @@
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.CheckboxInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;ul&gt;
+ &lt;li&gt;setUncheckedValue - The default value of an unchecked box can be overridden by setting the 'uncheckedValue' property.&lt;/li&gt;
+ &lt;/ul&gt;
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=org.apache.struts2.interceptor.CheckboxInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/client-validation.html b/content/core-developers/client-validation.html
index 4f56cc3..3b5411f 100644
--- a/content/core-developers/client-validation.html
+++ b/content/core-developers/client-validation.html
@@ -149,8 +149,12 @@
 
 <p>Create the form.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=clientValidation|lang=xml|javadoc=false|url=struts2/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client.jsp</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: clientValidation not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-client/jsp.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 <p>(information) This case uses the default xhtml theme, so the</p>
 
@@ -163,8 +167,12 @@
 
 <p>Create the Action class.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=quizAction|javadoc=false|lang=java|url=struts2/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+START SNIPPET: quizAction not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p><strong>Step 3</strong></p>
@@ -176,8 +184,12 @@
 </div>
 <p>to configure the validators to be used.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=quizValidators|javadoc=false|lang=xml|url=struts2/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: quizValidators not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation/xml.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p><strong>Action and Namespace</strong></p>
diff --git a/content/core-developers/conversion-annotation.html b/content/core-developers/conversion-annotation.html
index 64529e6..02f6237 100644
--- a/content/core-developers/conversion-annotation.html
+++ b/content/core-developers/conversion-annotation.html
@@ -129,26 +129,66 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/conversion-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="conversion-annotation">Conversion Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.conversion.annotations.Conversion</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> A marker annotation for type conversions at Type level.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.conversion.annotations.Conversion</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> The Conversion annotation must be applied at Type level.
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.conversion.annotations.Conversion</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table summary=""&gt;
+ &lt;thead&gt;
+ &lt;tr&gt;
+ &lt;th&gt;Parameter&lt;/th&gt;
+ &lt;th&gt;Required&lt;/th&gt;
+ &lt;th&gt;Default&lt;/th&gt;
+ &lt;th&gt;Description&lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;/thead&gt;
+ &lt;tbody&gt;
+ &lt;tr&gt;
+ &lt;td&gt;conversion&lt;/td&gt;
+ &lt;td&gt;no&lt;/td&gt;
+ &lt;td&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td&gt;used for Type Conversions applied at Type level.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/tbody&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.conversion.annotations.Conversion</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;Conversion(
+     conversions = {
+          // key must be the name of a property for which converter should be used
+          &amp;#64;TypeConversion(key = "date", converter = "org.demo.converter.DateConverter")
+     }
+ )
+ public class ConversionAction implements Action {
+
+     private Date date;
+
+     public setDate(Date date) {
+         this.date = date;
+     }
+
+     public Date getDate() {
+         return date;
+     }
+
+ }
+
+```
+
+</code></pre>
 </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 7e28dac..237eb25 100644
--- a/content/core-developers/conversion-error-field-validator-annotation.html
+++ b/content/core-developers/conversion-error-field-validator-annotation.html
@@ -129,26 +129,74 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/conversion-error-field-validator-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="conversionerrorfieldvalidator-annotation">ConversionErrorFieldValidator Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ConversionErrorFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This validator checks if there are any conversion errors for a field and applies them if they exist.
+ See &lt;a href="https://struts.apache.org/docs/type-conversion.html#TypeConversion-TypeConversionErrorHandling"&gt;Type Conversion Error Handling&lt;/a&gt; for details.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ConversionErrorFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The ConversionErrorFieldValidator annotation must be applied at method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ConversionErrorFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;message&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;field error message&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;key&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;i18n key from language specific properties file.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;messageParams&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Additional params to be used to customize message - will be evaluated against the Value Stack&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;fieldName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;shortCircuit&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;If this validator should be used as shortCircuit.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;type&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;ValidatorType.FIELD&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Enum value from ValidatorType. Either FIELD or SIMPLE can be used here.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.ConversionErrorFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;ConversionErrorFieldValidator(message = "Default message", key = "i18n.key", shortCircuit = true)
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/conversion-error-interceptor.html b/content/core-developers/conversion-error-interceptor.html
index 588d127..5a74d73 100644
--- a/content/core-developers/conversion-error-interceptor.html
+++ b/content/core-developers/conversion-error-interceptor.html
@@ -133,32 +133,68 @@
 
 <p>From the Javadocs of the XWork 2 interceptor:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.ConversionErrorInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> ConversionErrorInterceptor adds conversion errors from the ActionContext to the Action's field errors.
+
+ &lt;p&gt;
+ This interceptor adds any error found in the {@link ActionContext}'s conversionErrors map as a field error (provided
+ that the action implements {@link ValidationAware}). In addition, any field that contains a validation error has its
+ original value saved such that any subsequent requests for that value return the original value rather than the value
+ in the action. This is important because if the value "abc" is submitted and can't be converted to an int, we want to
+ display the original string ("abc") again rather than the int value (likely 0, which would make very little sense to
+ the user).
+ &lt;/p&gt;
+ 
+ &lt;p&gt;
+ &lt;b&gt;Note:&lt;/b&gt; Since 2.5.2, this interceptor extends {@link MethodFilterInterceptor}, therefore being
+ able to deal with excludeMethods / includeMethods parameters. See [Workflow Interceptor]
+ (class {@link DefaultWorkflowInterceptor}) for documentation and examples on how to use this feature.
+ &lt;/p&gt;
+ 
+</code></pre>
 </div>
 
 <p>From the Javadocs of the Struts 2 interceptor:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.interceptor.StrutsConversionErrorInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ This interceptor extends {@link ConversionErrorInterceptor} but only adds conversion errors from the ActionContext to
+ the field errors of the action if the field value is not null, "", or {""} (a size 1 String array with only an empty
+ String). See {@link ConversionErrorInterceptor} for more information, as well as the Type Conversion documentation.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.StrutsConversionErrorInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;None&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=org.apache.struts2.interceptor.StrutsConversionErrorInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ There are no known extension points for this interceptor.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.interceptor.StrutsConversionErrorInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="params"/&amp;gt;
+     &amp;lt;interceptor-ref name="conversionError"/&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/cookie-interceptor.html b/content/core-developers/cookie-interceptor.html
index 1a6e400..3ed024b 100644
--- a/content/core-developers/cookie-interceptor.html
+++ b/content/core-developers/cookie-interceptor.html
@@ -129,26 +129,143 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/cookie-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="cookie-interceptor">Cookie Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.interceptor.CookieInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;
+ The aim of this interceptor is to set values in the stack/action based on cookie name/value
+ of interest.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ If an asterisk is present in cookiesName parameter, it will be assume that
+ all cookies name are to be injected into struts' action, even though
+ cookiesName is comma-separated by other values, e.g. (cookie1,*,cookie2).
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ If cookiesName is left empty it will assume that no cookie will be injected
+ into Struts' action.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ If an asterisk is present in cookiesValue parameter, it will assume that all
+ cookies name irrespective of its value will be injected into Struts' action so
+ long as the cookie name matches those specified in cookiesName parameter.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ If cookiesValue is left empty it will assume that all cookie that match the cookieName
+ parameter will be injected into Struts' action.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ The action could implement {@link CookiesAware} in order to have a {@link Map}
+ of filtered cookies set into it.
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>Parameters</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.CookieInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+      &lt;li&gt;cookiesName (mandatory) - Name of cookies to be injected into the action. If more
+                                                                 than one cookie name is desired it could be comma-separated.
+                                                                 If all cookies name is desired, it could simply be *, an asterik.
+                                                                 When many cookies name are comma-separated either of the cookie
+                                                        that match the name in the comma-separated list will be qualified.&lt;/li&gt;
+     &lt;li&gt;cookiesValue (mandatory) - Value of cookies that if its name matches cookieName attribute
+                                                         and its value matched this, will be injected into Struts'
+                                                         action. If more than one cookie name is desired it could be
+                                                         comma-separated. If left empty, it will assume any value would
+                                                         be ok. If more than one value is specified (comma-separated)
+                                                         it will assume a match if either value is matched.&lt;/li&gt;
+     &lt;li&gt;acceptCookieNames (optional) - Pattern used to check if name of cookie matches the provided patter, to &lt;/li&gt;
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>Extending the Interceptor</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=org.apache.struts2.interceptor.CookieInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+     &lt;li&gt;
+         populateCookieValueIntoStack - this method will decide if this cookie value is qualified
+         to be populated into the value stack (hence into the action itself)
+     &lt;/li&gt;
+     &lt;li&gt;
+         injectIntoCookiesAwareAction - this method will inject selected cookies (as a java.util.Map)
+         into action that implements &amp;#x7b;@link CookiesAware&amp;#x7d;.
+     &lt;/li&gt;
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>Examples</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.interceptor.CookieInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;!--
+   This example will inject cookies named either 'cookie1' or 'cookie2' whose
+   value could be either 'cookie1value' or 'cookie2value' into Struts' action.
+ --&amp;gt;
+ &amp;lt;action ... &amp;gt;
+    &amp;lt;interceptor-ref name="cookie"&amp;gt;
+        &amp;lt;param name="cookiesName"&amp;gt;cookie1, cookie2&amp;lt;/param&amp;gt;
+        &amp;lt;param name="cookiesValue"&amp;gt;cookie1value, cookie2value&amp;lt;/param&amp;gt;
+    &amp;lt;/interceptor-ref&amp;gt;
+    ....
+ &amp;lt;/action&amp;gt;
+
+
+ &amp;lt;!--
+      This example will inject cookies named either 'cookie1' or 'cookie2'
+     regardless of their value into Struts' action.
+ --&amp;gt;
+ &amp;lt;action ... &amp;gt;
+   &amp;lt;interceptor-ref name="cookie"&amp;gt;
+      &amp;lt;param name="cookiesName"&amp;gt;cookie1, cookie2&amp;lt;/param&amp;gt;
+      &amp;lt;param name="cookiesValue"&amp;gt;*&amp;lt;/param&amp;gt;
+   &amp;lt;interceptor-ref&amp;gt;
+   ...
+ &amp;lt;/action&amp;gt;
+
+
+ &amp;lt;!--
+      This example will inject cookies named either 'cookie1' with value
+      'cookie1value' or 'cookie2' with value 'cookie2value' into Struts'
+      action.
+ --&amp;gt;
+ &amp;lt;action ... &amp;gt;
+   &amp;lt;interceptor-ref name="cookie"&amp;gt;
+      &amp;lt;param name="cookiesName"&amp;gt;cookie1&amp;lt;/param&amp;gt;
+      &amp;lt;param name="cookiesValue"&amp;gt;cookie1value&amp;lt;/param&amp;gt;
+   &amp;lt;/interceptor-ref&amp;gt;
+   &amp;lt;interceptor-ref name="cookie"&amp;gt;
+      &amp;lt;param name="cookiesName"&amp;lt;cookie2&amp;lt;/param&amp;gt;
+     &amp;lt;param name="cookiesValue"&amp;gt;cookie2value&amp;lt;/param&amp;gt;
+   &amp;lt;/interceptor-ref&amp;gt;
+   ....
+ &amp;lt;/action&amp;gt;
+
+ &amp;lt;!--
+    This example will inject any cookies regardless of its value into
+    Struts' action.
+  --&amp;gt;
+ &amp;lt;action ... &amp;gt;
+   &amp;lt;interceptor-ref name="cookie"&amp;gt;
+      &amp;lt;param name="cookiesName"&amp;gt;*&amp;lt;/param&amp;gt;
+      &amp;lt;param name="cookiesValue"&amp;gt;*&amp;lt;/param&amp;gt;
+   &amp;lt;/interceptor-ref&amp;gt;
+    ...
+ &amp;lt;/action&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/cookie-provider-interceptor.html b/content/core-developers/cookie-provider-interceptor.html
index b4824fb..eea5059 100644
--- a/content/core-developers/cookie-provider-interceptor.html
+++ b/content/core-developers/cookie-provider-interceptor.html
@@ -129,26 +129,44 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/cookie-provider-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="cookieprovider-interceptor">CookieProvider Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.interceptor.CookieProviderInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Allows actions to send cookies to client, action must implement {@link CookieProvider}
+ You must reference this interceptor in your default stack or in action's stack, see example below.
+
+</code></pre>
 </div>
 
 <p>Parameters</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.CookieProviderInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ none
+
+</code></pre>
 </div>
 
 <p>Extending the Interceptor</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=org.apache.struts2.interceptor.CookieProviderInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+     &lt;li&gt;addCookiesToResponse - this method applies cookie created by action to response&lt;/li&gt;
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>Examples</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.interceptor.CookieProviderInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;action ... &amp;gt;
+   &amp;lt;interceptor-ref name="defaultStack"/&amp;gt;
+   &amp;lt;interceptor-ref name="cookieProvider"/&amp;gt;
+   ...
+ &amp;lt;/action&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/create-if-null-annotation.html b/content/core-developers/create-if-null-annotation.html
index e1db105..4741392 100644
--- a/content/core-developers/create-if-null-annotation.html
+++ b/content/core-developers/create-if-null-annotation.html
@@ -129,26 +129,48 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/create-if-null-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="createifnull-annotation">CreateIfNull Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.util.CreateIfNull</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Sets the CreateIfNull for type conversion.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.util.CreateIfNull</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The CreateIfNull annotation must be applied at field or method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.util.CreateIfNull</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table summary=""&gt;
+ &lt;thead&gt;
+ &lt;tr&gt;
+ &lt;th&gt;Parameter&lt;/th&gt;
+ &lt;th&gt;Required&lt;/th&gt;
+ &lt;th&gt;Default&lt;/th&gt;
+ &lt;th&gt;Description&lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;/thead&gt;
+ &lt;tbody&gt;
+ &lt;tr&gt;
+ &lt;td&gt;value&lt;/td&gt;
+ &lt;td&gt;no&lt;/td&gt;
+ &lt;td&gt;false&lt;/td&gt;
+ &lt;td&gt;The CreateIfNull property value.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/tbody&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.util.CreateIfNull</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;CreateIfNull( value = true )
+ private List&amp;lt;User&amp;gt; users;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/create-session-interceptor.html b/content/core-developers/create-session-interceptor.html
index 042e2ca..f986c10 100644
--- a/content/core-developers/create-session-interceptor.html
+++ b/content/core-developers/create-session-interceptor.html
@@ -129,26 +129,53 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/create-session-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="create-session-interceptor">Create Session Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.interceptor.CreateSessionInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;
+ This interceptor creates the HttpSession if it doesn't exist, also SessionMap is recreated and put in ServletActionContext.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ This is particular useful when using the &amp;lt;@s.token&amp;gt; tag in freemarker templates.
+ The tag &lt;b&gt;do&lt;/b&gt; require that a HttpSession is already created since freemarker commits
+ the response to the client immediately.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.CreateSessionInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+ &lt;li&gt;None&lt;/li&gt;
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=org.apache.struts2.interceptor.CreateSessionInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+  &lt;li&gt;None&lt;/li&gt;
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.interceptor.CreateSessionInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="createSession"/&amp;gt;
+     &amp;lt;interceptor-ref name="defaultStack"/&amp;gt;
+     &amp;lt;result name="input"&amp;gt;input_with_token_tag.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/custom-validator-annotation.html b/content/core-developers/custom-validator-annotation.html
index 97f492b..2798e7f 100644
--- a/content/core-developers/custom-validator-annotation.html
+++ b/content/core-developers/custom-validator-annotation.html
@@ -129,26 +129,73 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/custom-validator-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="customvalidator-annotation">CustomValidator Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.CustomValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This annotation can be used for custom validators. Use the ValidationParameter annotation to supply additional params.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.CustomValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The annotation must be applied at method or type level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.CustomValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;message&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;field error message&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;key&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;i18n key from language specific properties file.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;messageParams&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Additional params to be used to customize message - will be evaluated against the Value Stack&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;fieldName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;shortCircuit&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;If this validator should be used as shortCircuit.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;type&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;name of validator&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Simple string which identifies that validator among other&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.CustomValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;CustomValidator(type ="customValidatorName", fieldName = "myField")
+```
+
+</code></pre>
 </div>
 
 <p>#####Adding Parameters#####</p>
diff --git a/content/core-developers/date-range-field-validator-annotation.html b/content/core-developers/date-range-field-validator-annotation.html
index bb68963..afd03fa 100644
--- a/content/core-developers/date-range-field-validator-annotation.html
+++ b/content/core-developers/date-range-field-validator-annotation.html
@@ -129,26 +129,111 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/date-range-field-validator-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="daterangefieldvalidator-annotation">DateRangeFieldValidator Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.DateRangeFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This validator checks that a date field has a value within a specified range.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.DateRangeFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The annotation must be applied at method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.DateRangeFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;message&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;field error message&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;key&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;i18n key from language specific properties file.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;messageParams&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Additional params to be used to customize message - will be evaluated against the Value Stack&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;fieldName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;shortCircuit&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;If this validator should be used as shortCircuit.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;type&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;ValidatorType.FIELD&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Enum value from ValidatorType. Either FIELD or SIMPLE can be used here.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; min &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Date property.  The minimum the date must be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;minExpression&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;OGNL expression used to obtain the minimum the date must be.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; max &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Date property.  The maximum date can be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;maxExpression&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;OGNL expression used to obtain the maximum date can be.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;maxExpression&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;OGNL expression used to obtain the maximum date can be.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;dateFormat&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Format used to parse min/max value.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+
+ &lt;p&gt;If neither &lt;em&gt;min&lt;/em&gt; nor &lt;em&gt;max&lt;/em&gt; is set, nothing will be done.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.DateRangeFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;DateRangeFieldValidator(message = "Default message", key = "i18n.key", shortCircuit = true, min = "2005/01/01", max = "2005/12/31")
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/debugging-interceptor.html b/content/core-developers/debugging-interceptor.html
index 07a1b95..1f7758d 100644
--- a/content/core-developers/debugging-interceptor.html
+++ b/content/core-developers/debugging-interceptor.html
@@ -129,24 +129,42 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/debugging-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="debugginginterceptor">DebuggingInterceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.interceptor.debugging.DebuggingInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Provides several different debugging screens to provide insight into the
+ data behind the page.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=remarks|javadoc=true|url=org.apache.struts2.interceptor.debugging.DebuggingInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This interceptor only is activated when devMode is enabled in
+ struts.properties. The 'debug' parameter is removed from the parameter list
+ before the action is executed. All operations occur before the natural
+ Result has a chance to execute.
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.debugging.DebuggingInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;ul&gt;
+ &lt;li&gt; &lt;code&gt;xml&lt;/code&gt; - Dumps the parameters, context, session, and value
+ stack as an XML document.&lt;/li&gt;
+ &lt;li&gt; &lt;code&gt;console&lt;/code&gt; - Shows a popup 'OGNL Console' that allows the
+ user to test OGNL expressions against the value stack. The XML data from
+ the 'xml' mode is inserted at the top of the page.&lt;/li&gt;
+ &lt;li&gt; &lt;code&gt;command&lt;/code&gt; - Tests an OGNL expression and returns the
+ string result. Only used by the OGNL console.&lt;/li&gt;
+ &lt;li&gt;&lt;code&gt;browser&lt;/code&gt; Shows field values of an object specified in the 
+ &lt;code&gt;object&lt;/code&gt; parameter (#context by default). When the &lt;code&gt;object&lt;/code&gt;
+ parameters is set, the '#' character needs to be escaped to '%23'. Like
+ debug=browser&amp;amp;object=%23parameters&lt;/li&gt;
+ &lt;/ul&gt;
+</code></pre>
 </div>
 
 <p>#####Example#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|url=org.apache.struts2.interceptor.debugging.DebuggingInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>  http://localhost:8080/Welcome.action?debug=xml
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/default-workflow-interceptor.html b/content/core-developers/default-workflow-interceptor.html
index b7c3e92..b502c87 100644
--- a/content/core-developers/default-workflow-interceptor.html
+++ b/content/core-developers/default-workflow-interceptor.html
@@ -129,30 +129,115 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/default-workflow-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="default-workflow-interceptor">Default Workflow Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ An interceptor that makes sure there are not validation, conversion or action errors before allowing the interceptor chain to continue. 
+ If a single FieldError or ActionError (including the ones replicated by the Message Store Interceptor in a redirection) is found, the INPUT result will be triggered.
+ &lt;b&gt;This interceptor does not perform any validation&lt;/b&gt;.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ This interceptor does nothing if the name of the method being invoked is specified in the &lt;b&gt;excludeMethods&lt;/b&gt;
+ parameter. &lt;b&gt;excludeMethods&lt;/b&gt; accepts a comma-delimited list of method names. For example, requests to
+ &lt;b&gt;foo!input.action&lt;/b&gt; and &lt;b&gt;foo!back.action&lt;/b&gt; will be skipped by this interceptor if you set the
+ &lt;b&gt;excludeMethods&lt;/b&gt; parameter to "input, back".
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;Note:&lt;/b&gt; As this method extends off MethodFilterInterceptor, it is capable of
+ deciding if it is applicable only to selective methods in the action class. This is done by adding param tags
+ for the interceptor element, naming either a list of excluded method names and/or a list of included method
+ names, whereby includeMethods overrides excludedMethods. A single * sign is interpreted as wildcard matching
+ all methods for both parameters.
+ See {@link MethodFilterInterceptor} for more info.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ This interceptor also supports the following interfaces which can implemented by actions:
+ &lt;/p&gt;
+
+ &lt;ul&gt;
+     &lt;li&gt;ValidationAware - implemented by ActionSupport class&lt;/li&gt;
+     &lt;li&gt;ValidationWorkflowAware - allows changing result name programmatically&lt;/li&gt;
+     &lt;li&gt;ValidationErrorAware - notifies action about errors and also allow change result name&lt;/li&gt;
+ &lt;/ul&gt;
+
+ &lt;p&gt;
+ You can also use InputConfig annotation to change result name returned when validation errors occurred.
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadocDefaultWorkflowInterceptor|javadoc=true|url=com.opensymphony.xwork2.interceptor.PrefixMethodInvocationUtil</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> 
+ &lt;b&gt;In DefaultWorkflowInterceptor&lt;/b&gt;
+ &lt;p&gt;applies only when action implements {@link com.opensymphony.xwork2.Validateable}&lt;/p&gt;
+ &lt;ol&gt;
+    &lt;li&gt;if the action class have validate{MethodName}(), it will be invoked&lt;/li&gt;
+    &lt;li&gt;else if the action class have validateDo{MethodName}(), it will be invoked&lt;/li&gt;
+    &lt;li&gt;no matter if 1] or 2] is performed, if alwaysInvokeValidate property of the interceptor is "true" (which is by default "true"), validate() will be invoked.&lt;/li&gt;
+ &lt;/ol&gt;
+ 
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;ul&gt;
+ &lt;li&gt;inputResultName - Default to "input". Determine the result name to be returned when
+ an action / field error is found.&lt;/li&gt;
+ &lt;/ul&gt;
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;There are no known extension points for this interceptor.&lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="params"/&amp;gt;
+     &amp;lt;interceptor-ref name="validation"/&amp;gt;
+     &amp;lt;interceptor-ref name="workflow"/&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+
+ &amp;lt;-- In this case myMethod as well as mySecondMethod of the action class
+        will not pass through the workflow process --&amp;gt;
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="params"/&amp;gt;
+     &amp;lt;interceptor-ref name="validation"/&amp;gt;
+     &amp;lt;interceptor-ref name="workflow"&amp;gt;
+         &amp;lt;param name="excludeMethods"&amp;gt;myMethod,mySecondMethod&amp;lt;/param&amp;gt;
+     &amp;lt;/interceptor-ref name="workflow"&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+
+ &amp;lt;-- In this case, the result named "error" will be used when
+        an action / field error is found --&amp;gt;
+ &amp;lt;-- The Interceptor will only be applied for myWorkflowMethod method of action
+        classes, since this is the only included method while any others are excluded --&amp;gt;
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="params"/&amp;gt;
+     &amp;lt;interceptor-ref name="validation"/&amp;gt;
+     &amp;lt;interceptor-ref name="workflow"&amp;gt;
+        &amp;lt;param name="inputResultName"&amp;gt;error&amp;lt;/param&amp;gt;
+         &amp;lt;param name="excludeMethods"&amp;gt;*&amp;lt;/param&amp;gt;
+         &amp;lt;param name="includeMethods"&amp;gt;myWorkflowMethod&amp;lt;/param&amp;gt;
+     &amp;lt;/interceptor-ref&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/double-range-field-validator-annotation.html b/content/core-developers/double-range-field-validator-annotation.html
index a3fad2d..ec4e125 100644
--- a/content/core-developers/double-range-field-validator-annotation.html
+++ b/content/core-developers/double-range-field-validator-annotation.html
@@ -129,26 +129,126 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/double-range-field-validator-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="doublerangefieldvalidator-annotation">DoubleRangeFieldValidator Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.DoubleRangeFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This validator checks that a double field has a value within a specified range.
+ If neither min nor max is set, nothing will be done.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.DoubleRangeFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The annotation must be applied at method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.DoubleRangeFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;message&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;field error message&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;key&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;i18n key from language specific properties file.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;messageParams&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Additional params to be used to customize message - will be evaluated against the Value Stack&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;fieldName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;shortCircuit&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;If this validator should be used as shortCircuit.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;type&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;ValidatorType.FIELD&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Enum value from ValidatorType. Either FIELD or SIMPLE can be used here.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; minInclusive &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Double property.  The inclusive minimum the number must be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;minInclusiveExpression&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;OGNL expression used to obtain the inclusive minimum the number must be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; maxInclusive &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Double property.  The inclusive maximum number can be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; maxInclusiveExpression &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;OGNL expression used to obtain the inclusive maximum number can be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; minExclusive &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Double property.  The exclusive minimum the number must be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; minExclusiveExpression &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;OGNL expression used to obtain the exclusive minimum the number must be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; maxExclusive &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Double property.  The exclusive maximum number can be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; maxExclusiveExpression &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;OGNL expression used to obtain the exclusive maximum number can be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+
+ &lt;p&gt;If neither &lt;em&gt;min&lt;/em&gt; nor &lt;em&gt;max&lt;/em&gt; is set, nothing will be done.&lt;/p&gt;
+
+ &lt;p&gt;The values for min and max must be inserted as String values so that "0" can be handled as a possible value.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.DoubleRangeFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;DoubleRangeFieldValidator(message = "Default message", key = "i18n.key", shortCircuit = true, minInclusive = "0.123", maxInclusive = "99.987")
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/element-annotation.html b/content/core-developers/element-annotation.html
index 485a7ee..cfd7124 100644
--- a/content/core-developers/element-annotation.html
+++ b/content/core-developers/element-annotation.html
@@ -129,20 +129,37 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/element-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="element-annotation">Element Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.util.Element</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Sets the Element for type conversion.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.util.Element</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The Element annotation must be applied at field or method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.util.Element</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table summary=""&gt;
+ &lt;thead&gt;
+ &lt;tr&gt;
+ &lt;th&gt;Parameter&lt;/th&gt;
+ &lt;th&gt;Required&lt;/th&gt;
+ &lt;th&gt;Default&lt;/th&gt;
+ &lt;th&gt;Description&lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;/thead&gt;
+ &lt;tbody&gt;
+ &lt;tr&gt;
+ &lt;td&gt;value&lt;/td&gt;
+ &lt;td&gt;no&lt;/td&gt;
+ &lt;td&gt;java.lang.Object.class&lt;/td&gt;
+ &lt;td&gt;The element property value.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/tbody&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
diff --git a/content/core-developers/email-validator-annotation.html b/content/core-developers/email-validator-annotation.html
index 021fc48..c8176bc 100644
--- a/content/core-developers/email-validator-annotation.html
+++ b/content/core-developers/email-validator-annotation.html
@@ -129,26 +129,73 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/email-validator-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="emailvalidator-annotation">EmailValidator Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.EmailValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This validator checks that a field is a valid e-mail address if it contains a non-empty String.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.EmailValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The annotation must be applied at method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.EmailValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;message&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;field error message&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;key&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;i18n key from language specific properties file.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;messageParams&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Additional params to be used to customize message - will be evaluated against the Value Stack&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;fieldName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;shortCircuit&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;If this validator should be used as shortCircuit.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;type&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;ValidatorType.FIELD&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Enum value from ValidatorType. Either FIELD or SIMPLE can be used here.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.EmailValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;EmailValidator(message = "Default message", key = "i18n.key", shortCircuit = true)
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/exception-interceptor.html b/content/core-developers/exception-interceptor.html
index 502ba8d..2a051b7 100644
--- a/content/core-developers/exception-interceptor.html
+++ b/content/core-developers/exception-interceptor.html
@@ -129,26 +129,81 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/exception-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <p>#Exception Interceptor</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ This interceptor forms the core functionality of the exception handling feature. Exception handling allows you to map
+ an exception to a result code, just as if the action returned a result code instead of throwing an unexpected
+ exception. When an exception is encountered, it is wrapped with an {@link ExceptionHolder} and pushed on the stack,
+ providing easy access to the exception from within your result.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;Note:&lt;/b&gt; While you can configure exception mapping in your configuration file at any point, the configuration
+ will not have any effect if this interceptor is not in the interceptor stack for your actions. It is recommended that
+ you make this interceptor the first interceptor on the stack, ensuring that it has full access to catch any
+ exception, even those caused by other interceptors.
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;logEnabled (optional) - Should exceptions also be logged? (boolean true|false)&lt;/li&gt;
+ 
+ &lt;li&gt;logLevel (optional) - what log level should we use (&lt;code&gt;trace, debug, info, warn, error, fatal&lt;/code&gt;)? - defaut is &lt;code&gt;debug&lt;/code&gt;&lt;/li&gt;
+ 
+ &lt;li&gt;logCategory (optional) - If provided we would use this category (eg. &lt;code&gt;com.mycompany.app&lt;/code&gt;).
+ Default is to use &lt;code&gt;com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor&lt;/code&gt;.&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+ &lt;p&gt;
+ The parameters above enables us to log all thrown exceptions with stacktace in our own logfile,
+ and present a friendly webpage (with no stacktrace) to the end user.
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ If you want to add custom handling for publishing the Exception, you may override
+ {@link #publishException(com.opensymphony.xwork2.ActionInvocation, ExceptionHolder)}. The default implementation
+ pushes the given ExceptionHolder on value stack. A custom implementation could add additional logging etc.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;xwork&amp;gt;
+     &amp;lt;package name="default" extends="xwork-default"&amp;gt;
+         &amp;lt;global-results&amp;gt;
+             &amp;lt;result name="error" type="freemarker"&amp;gt;error.ftl&amp;lt;/result&amp;gt;
+         &amp;lt;/global-results&amp;gt;
+
+         &amp;lt;global-exception-mappings&amp;gt;
+             &amp;lt;exception-mapping exception="java.lang.Exception" result="error"/&amp;gt;
+         &amp;lt;/global-exception-mappings&amp;gt;
+
+         &amp;lt;action name="test"&amp;gt;
+             &amp;lt;interceptor-ref name="exception"/&amp;gt;
+             &amp;lt;interceptor-ref name="basicStack"/&amp;gt;
+             &amp;lt;exception-mapping exception="com.acme.CustomException" result="custom_error"/&amp;gt;
+             &amp;lt;result name="custom_error"&amp;gt;custom_error.ftl&amp;lt;/result&amp;gt;
+             &amp;lt;result name="success" type="freemarker"&amp;gt;test.ftl&amp;lt;/result&amp;gt;
+         &amp;lt;/action&amp;gt;
+     &amp;lt;/package&amp;gt;
+ &amp;lt;/xwork&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/execute-and-wait-interceptor.html b/content/core-developers/execute-and-wait-interceptor.html
index 27cdd61..13ec40c 100644
--- a/content/core-developers/execute-and-wait-interceptor.html
+++ b/content/core-developers/execute-and-wait-interceptor.html
@@ -129,26 +129,142 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/execute-and-wait-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="execute-and-wait-interceptor">Execute and Wait Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.interceptor.ExecuteAndWaitInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ The ExecuteAndWaitInterceptor is great for running long-lived actions in the background while showing the user a nice
+ progress meter. This also prevents the HTTP request from timing out when the action takes more than 5 or 10 minutes.
+ &lt;/p&gt;
+
+ &lt;p&gt; Using this interceptor is pretty straight forward. Assuming that you are including struts-default.xml, this
+ interceptor is already configured but is not part of any of the default stacks. Because of the nature of this
+ interceptor, it must be the &lt;b&gt;last&lt;/b&gt; interceptor in the stack.
+ &lt;/p&gt;
+
+ &lt;p&gt; This interceptor works on a per-session basis. That means that the same action name (myLongRunningAction, in the
+ above example) cannot be run more than once at a time in a given session. On the initial request or any subsequent
+ requests (before the action has completed), the &lt;b&gt;wait&lt;/b&gt; result will be returned. &lt;b&gt;The wait result is
+ responsible for issuing a subsequent request back to the action, giving the effect of a self-updating progress
+ meter&lt;/b&gt;.
+ &lt;/p&gt;
+
+ &lt;p&gt; If no "wait" result is found, Struts will automatically generate a wait result on the fly. This result is
+ written in FreeMarker and cannot run unless FreeMarker is installed. If you don't wish to deploy with FreeMarker, you
+ must provide your own wait result. This is generally a good thing to do anyway, as the default wait page is very
+ plain.
+ &lt;/p&gt;
+
+ &lt;p&gt;Whenever the wait result is returned, the &lt;b&gt;action that is currently running in the background will be placed on
+ top of the stack&lt;/b&gt;. This allows you to display progress data, such as a count, in the wait page. By making the wait
+ page automatically reload the request to the action (which will be short-circuited by the interceptor), you can give
+ the appearance of an automatic progress meter.
+ &lt;/p&gt;
+
+ &lt;p&gt;This interceptor also supports using an initial wait delay. An initial delay is a time in milliseconds we let the
+ server wait before the wait page is shown to the user. During the wait this interceptor will wake every 100 millis
+ to check if the background process is done premature, thus if the job for some reason doesn't take to long the wait
+ page is not shown to the user.
+ &lt;br&gt; This is useful for e.g. search actions that have a wide span of execution time. Using a delay time of 2000
+ millis we ensure the user is presented fast search results immediately and for the slow results a wait page is used.
+ &lt;/p&gt;
+
+ &lt;p&gt;&lt;b&gt;Important&lt;/b&gt;: Because the action will be running in a separate thread, you can't use ActionContext because it
+ is a ThreadLocal. This means if you need to access, for example, session data, you need to implement SessionAware
+ rather than calling ActionContext.getSession().
+ &lt;/p&gt;
+
+ &lt;p&gt;The thread kicked off by this interceptor will be named in the form &lt;b&gt;&lt;u&gt;actionName&lt;/u&gt;BackgroundProcess&lt;/b&gt;.
+ For example, the &lt;i&gt;search&lt;/i&gt; action would run as a thread named &lt;i&gt;searchBackgroundProcess&lt;/i&gt;.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.ExecuteAndWaitInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;threadPriority (optional) - the priority to assign the thread. Default is &lt;code&gt;Thread.NORM_PRIORITY&lt;/code&gt;.&lt;/li&gt;
+ &lt;li&gt;delay (optional) - an initial delay in millis to wait before the wait page is shown (returning &lt;code&gt;wait&lt;/code&gt; as result code). Default is no initial delay.&lt;/li&gt;
+ &lt;li&gt;delaySleepInterval (optional) - only used with delay. Used for waking up at certain intervals to check if the background process is already done. Default is 100 millis.&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=org.apache.struts2.interceptor.ExecuteAndWaitInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ If you wish to make special preparations before and/or after the invocation of the background thread, you can extend
+ the BackgroundProcess class and implement the beforeInvocation() and afterInvocation() methods. This may be useful
+ for obtaining and releasing resources that the background process will need to execute successfully. To use your
+ background process extension, extend ExecuteAndWaitInterceptor and implement the getNewBackgroundProcess() method.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.interceptor.ExecuteAndWaitInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="completeStack"/&amp;gt;
+     &amp;lt;interceptor-ref name="execAndWait"/&amp;gt;
+     &amp;lt;result name="wait"&amp;gt;longRunningAction-wait.jsp&amp;lt;/result&amp;gt;
+     &amp;lt;result name="success"&amp;gt;longRunningAction-success.jsp&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+
+ &amp;lt;%@ taglib prefix="s" uri="/struts" %&amp;gt;
+ &amp;lt;html&amp;gt;
+   &amp;lt;head&amp;gt;
+     &amp;lt;title&amp;gt;Please wait&amp;lt;/title&amp;gt;
+     &amp;lt;meta http-equiv="refresh" content="5;url=&amp;lt;s:url includeParams="all" /&amp;gt;"/&amp;gt;
+   &amp;lt;/head&amp;gt;
+   &amp;lt;body&amp;gt;
+     Please wait while we process your request.
+     Click &amp;lt;a href="&amp;lt;s:url includeParams="all" /&amp;gt;"&amp;gt;&amp;lt;/a&amp;gt; if this page does not reload automatically.
+   &amp;lt;/body&amp;gt;
+ &amp;lt;/html&amp;gt;
+ &lt;/pre&gt;
+
+ &lt;p&gt;&lt;u&gt;Example code2:&lt;/u&gt;&lt;/p&gt;
+ &lt;p&gt;
+ This example will wait 2 second (2000 millis) before the wait page is shown to the user. Therefore
+ if the long process didn't last long anyway the user isn't shown a wait page.
+ &lt;/p&gt;
+
+ &lt;pre&gt;
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="completeStack"/&amp;gt;
+     &amp;lt;interceptor-ref name="execAndWait"&amp;gt;
+         &amp;lt;param name="delay"&amp;gt;2000&amp;lt;param&amp;gt;
+     &amp;lt;interceptor-ref&amp;gt;
+     &amp;lt;result name="wait"&amp;gt;longRunningAction-wait.jsp&amp;lt;/result&amp;gt;
+     &amp;lt;result name="success"&amp;gt;longRunningAction-success.jsp&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+ &lt;/pre&gt;
+
+ &lt;p&gt;&lt;u&gt;Example code3:&lt;/u&gt;&lt;/p&gt;
+ &lt;p&gt;
+ This example will wait 1 second (1000 millis) before the wait page is shown to the user.
+ And at every 50 millis this interceptor will check if the background process is done, if so
+ it will return before the 1 second has elapsed, and the user isn't shown a wait page.
+ &lt;/p&gt;
+
+ &lt;pre&gt;
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="completeStack"/&amp;gt;
+     &amp;lt;interceptor-ref name="execAndWait"&amp;gt;
+         &amp;lt;param name="delay"&amp;gt;1000&amp;lt;param&amp;gt;
+         &amp;lt;param name="delaySleepInterval"&amp;gt;50&amp;lt;param&amp;gt;
+     &amp;lt;interceptor-ref&amp;gt;
+     &amp;lt;result name="wait"&amp;gt;longRunningAction-wait.jsp&amp;lt;/result&amp;gt;
+     &amp;lt;result name="success"&amp;gt;longRunningAction-success.jsp&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+ &lt;/pre&gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/expression-validator-annotation.html b/content/core-developers/expression-validator-annotation.html
index dbaf789..1a31155 100644
--- a/content/core-developers/expression-validator-annotation.html
+++ b/content/core-developers/expression-validator-annotation.html
@@ -129,26 +129,67 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/expression-validator-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="expressionvalidator-annotation">ExpressionValidator Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ExpressionValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This non-field level validator validates a supplied regular expression.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ExpressionValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The annotation must be applied at method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ExpressionValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;message&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;field error message&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;key&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;i18n key from language specific properties file.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;messageParams&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Additional params to be used to customize message - will be evaluated against the Value Stack&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;shortCircuit&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;If this validator should be used as shortCircuit.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; expression &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; yes &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; An OGNL expression that returns a boolean value.  &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.ExpressionValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;ExpressionValidator(message = "Default message", key = "i18n.key", shortCircuit = true, expression = "an OGNL expression" )
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/field-expression-validator-annotation.html b/content/core-developers/field-expression-validator-annotation.html
index c31d72d..4f193ab 100644
--- a/content/core-developers/field-expression-validator-annotation.html
+++ b/content/core-developers/field-expression-validator-annotation.html
@@ -129,26 +129,75 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/field-expression-validator-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="fieldexpressionvalidator-annotation">FieldExpressionValidator Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.FieldExpressionValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This validator uses an OGNL expression to perform its validator.
+ The error message will be added to the field if the expression returns
+ false when it is evaluated against the value stack.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.FieldExpressionValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The annotation must be applied at method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.FieldExpressionValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;message&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;field error message&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;key&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;i18n key from language specific properties file.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;messageParams&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Additional params to be used to customize message - will be evaluated against the Value Stack&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;fieldName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;shortCircuit&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;If this validator should be used as shortCircuit.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; expression &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; yes &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; An OGNL expression that returns a boolean value.  &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.FieldExpressionValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;FieldExpressionValidator(message = "Default message", key = "i18n.key", shortCircuit = true, expression = "an OGNL expression")
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/file-upload-interceptor.html b/content/core-developers/file-upload-interceptor.html
index 9327252..74fb223 100644
--- a/content/core-developers/file-upload-interceptor.html
+++ b/content/core-developers/file-upload-interceptor.html
@@ -138,46 +138,149 @@
   </tbody>
 </table>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.interceptor.FileUploadInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Interceptor that is based off of {@link MultiPartRequestWrapper}, which is automatically applied for any request that
+ includes a file. It adds the following parameters, where [File Name] is the name given to the file uploaded by the
+ HTML form:
+ &lt;/p&gt;
+ &lt;ul&gt;
+
+ &lt;li&gt;[File Name] : File - the actual File&lt;/li&gt;
+
+ &lt;li&gt;[File Name]ContentType : String - the content type of the file&lt;/li&gt;
+
+ &lt;li&gt;[File Name]FileName : String - the actual name of the file uploaded (not the HTML name)&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+ &lt;p&gt;You can get access to these files by merely providing setters in your action that correspond to any of the three
+ patterns above, such as setDocument(File document), setDocumentContentType(String contentType), etc.
+ &lt;br&gt;See the example code section.
+ &lt;/p&gt;
+
+ &lt;p&gt; This interceptor will add several field errors, assuming that the action implements {@link ValidationAware}.
+ These error messages are based on several i18n values stored in struts-messages.properties, a default i18n file
+ processed for all i18n requests. You can override the text of these messages by providing text for the following
+ keys:
+ &lt;/p&gt;
+
+ &lt;ul&gt;
+
+ &lt;li&gt;struts.messages.error.uploading - a general error that occurs when the file could not be uploaded&lt;/li&gt;
+
+ &lt;li&gt;struts.messages.error.file.too.large - occurs when the uploaded file is too large&lt;/li&gt;
+
+ &lt;li&gt;struts.messages.error.content.type.not.allowed - occurs when the uploaded file does not match the expected
+ content types specified&lt;/li&gt;
+
+ &lt;li&gt;struts.messages.error.file.extension.not.allowed - occurs when the uploaded file does not match the expected
+ file extensions specified&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.FileUploadInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;maximumSize (optional) - the maximum size (in bytes) that the interceptor will allow a file reference to be set
+ on the action. Note, this is &lt;b&gt;not&lt;/b&gt; related to the various properties found in struts.properties.
+ Default to approximately 2MB.&lt;/li&gt;
+
+ &lt;li&gt;allowedTypes (optional) - a comma separated list of content types (ie: text/html) that the interceptor will allow
+ a file reference to be set on the action. If none is specified allow all types to be uploaded.&lt;/li&gt;
+
+ &lt;li&gt;allowedExtensions (optional) - a comma separated list of file extensions (ie: .html) that the interceptor will allow
+ a file reference to be set on the action. If none is specified allow all extensions to be uploaded.&lt;/li&gt;
+ &lt;/ul&gt;
+
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=org.apache.struts2.interceptor.FileUploadInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ You can extend this interceptor and override the acceptFile method to provide more control over which files
+ are supported and which are not.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
 <p><strong>Example action mapping:</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example-configuration|lang=xml|javadoc=true|url=org.apache.struts2.interceptor.FileUploadInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;action name="doUpload" class="com.example.UploadAction"&amp;gt;
+     &amp;lt;interceptor-ref name="fileUpload"/&amp;gt;
+     &amp;lt;interceptor-ref name="basicStack"/&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.jsp&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+```
+
+</code></pre>
 </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="p">{</span><span class="err">snippet:id=example-form|lang=xml|javadoc=true|url=org.apache.struts2.interceptor.FileUploadInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+   &amp;lt;s:form action="doUpload" method="post" enctype="multipart/form-data"&amp;gt;
+       &amp;lt;s:file name="upload" label="File"/&amp;gt;
+       &amp;lt;s:submit/&amp;gt;
+   &amp;lt;/s:form&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=multipart-note|javadoc=true|url=org.apache.struts2.interceptor.FileUploadInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ You must set the encoding to &lt;code&gt;multipart/form-data&lt;/code&gt; in the form where the user selects the file to upload.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Example Action class:</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example-action|lang=java|javadoc=true|url=org.apache.struts2.interceptor.FileUploadInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+    package com.example;
+
+    import java.io.File;
+    import com.opensymphony.xwork2.ActionSupport;
+
+    public UploadAction extends ActionSupport {
+       private File file;
+       private String contentType;
+       private String filename;
+
+       public void setUpload(File file) {
+          this.file = file;
+       }
+
+       public void setUploadContentType(String contentType) {
+          this.contentType = contentType;
+       }
+
+       public void setUploadFileName(String filename) {
+          this.filename = filename;
+       }
+
+       public String execute() {
+          //...
+          return SUCCESS;
+       }
+  }
+```
+
+</code></pre>
 </div>
 
 <p><strong>Setting parameters example:</strong></p>
diff --git a/content/core-developers/file-upload.html b/content/core-developers/file-upload.html
index e4784c3..e530199 100644
--- a/content/core-developers/file-upload.html
+++ b/content/core-developers/file-upload.html
@@ -234,8 +234,15 @@
 
 <p><strong>Example JSP form tags:</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example-form|lang=xml|javadoc=true|url=org.apache.struts2.interceptor.FileUploadInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+   &amp;lt;s:form action="doUpload" method="post" enctype="multipart/form-data"&amp;gt;
+       &amp;lt;s:file name="upload" label="File"/&amp;gt;
+       &amp;lt;s:submit/&amp;gt;
+   &amp;lt;/s:form&amp;gt;
+```
+
+</code></pre>
 </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 <strong>upload</strong> you would provide the three setter methods shown in the following example:</p>
 
diff --git a/content/core-developers/input-config-annotation.html b/content/core-developers/input-config-annotation.html
index 2a5c46d..e8d341b 100644
--- a/content/core-developers/input-config-annotation.html
+++ b/content/core-developers/input-config-annotation.html
@@ -129,26 +129,65 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/input-config-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="inputconfig-annotation">InputConfig Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.InputConfig</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Marks a action method that if it's not validated by ValidationInterceptor then execute input method or input result.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.InputConfig</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> The InputConfig annotation can be applied at method level.
+
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.InputConfig</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;methodName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;execute this method if specific&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;resultName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;return this result if methodName not specific&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.interceptor.annotations.InputConfig</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ public class SampleAction extends ActionSupport {
+
+  public void isValid() throws ValidationException {
+    // validate model object, throw exception if failed
+  }
+
+  &amp;#64;InputConfig(methodName="input")
+  public String execute() {
+     // perform action
+     return SUCCESS;
+  }
+  public String input() {
+     // perform some data filling
+     return INPUT;
+  }
+ }
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/int-range-field-validator-annotation.html b/content/core-developers/int-range-field-validator-annotation.html
index d0d050f..c7adb48 100644
--- a/content/core-developers/int-range-field-validator-annotation.html
+++ b/content/core-developers/int-range-field-validator-annotation.html
@@ -129,26 +129,110 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/int-range-field-validator-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="intrangefieldvalidator-annotation">IntRangeFieldValidator Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This validator checks that a numeric field has a value within a specified range.
+ If neither min nor max is set, nothing will be done.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The annotation must be applied at method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;message&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;field error message&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;key&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;i18n key from language specific properties file.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;messageParams&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Additional params to be used to customize message - will be evaluated against the Value Stack&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;fieldName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;shortCircuit&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;If this validator should be used as shortCircuit.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;type&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;ValidatorType.FIELD&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Enum value from ValidatorType. Either FIELD or SIMPLE can be used here.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; min &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Integer property. The minimum the number must be.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; minExpression &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;OGNL expression used to obtain the minimum the number must be.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; max &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Integer property. The maximum number can be. Can be an expression.!&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; maxExpression &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;OGNL expression used to obtain the maximum number can be.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;parse&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Enable parsing of min/max value.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+
+ &lt;p&gt;If neither &lt;em&gt;min&lt;/em&gt; nor &lt;em&gt;max&lt;/em&gt; is set, nothing will be done.&lt;/p&gt;
+
+ &lt;p&gt;The values for min and max must be inserted as String values so that "0" can be handled as a possible value.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;IntRangeFieldValidator(message = "Default message", key = "i18n.key", shortCircuit = true, min = "0", max = "42")
+
+ &amp;#64;IntRangeFieldValidator(message = "Default message", key = "i18n.key", shortCircuit = true, minExpression = "${minValue}", maxExpression = "${maxValue}")
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/key-annotation.html b/content/core-developers/key-annotation.html
index 0bbc775..5c890e3 100644
--- a/content/core-developers/key-annotation.html
+++ b/content/core-developers/key-annotation.html
@@ -129,26 +129,49 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/key-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="key-annotation">Key Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.util.Key</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Sets the Key for type conversion.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.util.Key</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The Key annotation must be applied at field or method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.util.Key</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table summary=""&gt;
+ &lt;thead&gt;
+ &lt;tr&gt;
+ &lt;th&gt;Parameter&lt;/th&gt;
+ &lt;th&gt;Required&lt;/th&gt;
+ &lt;th&gt;Default&lt;/th&gt;
+ &lt;th&gt;Description&lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;/thead&gt;
+ &lt;tbody&gt;
+ &lt;tr&gt;
+ &lt;td&gt;value&lt;/td&gt;
+ &lt;td&gt;no&lt;/td&gt;
+ &lt;td&gt;java.lang.Object.class&lt;/td&gt;
+ &lt;td&gt;The key property value.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/tbody&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.util.Key</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ // The key property for User objects within the users collection is the &lt;code&gt;userName&lt;/code&gt; attribute.
+ &amp;#64;Key( value = java.lang.Long.class )
+ private Map&amp;lt;Long, User&amp;gt; userMap;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/key-property-annotation.html b/content/core-developers/key-property-annotation.html
index 3979b6a..866737f 100644
--- a/content/core-developers/key-property-annotation.html
+++ b/content/core-developers/key-property-annotation.html
@@ -129,26 +129,50 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/key-property-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="keyproperty-annotation">KeyProperty Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.util.KeyProperty</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Sets the KeyProperty for type conversion.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.util.KeyProperty</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The KeyProperty annotation must be applied at field or method level.&lt;/p&gt;
+ &lt;p&gt;This annotation should be used with Generic types, if the key property of the key element needs to be specified.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.util.KeyProperty</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table summary=""&gt;
+ &lt;thead&gt;
+ &lt;tr&gt;
+ &lt;th&gt;Parameter&lt;/th&gt;
+ &lt;th&gt;Required&lt;/th&gt;
+ &lt;th&gt;Default&lt;/th&gt;
+ &lt;th&gt;Description&lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;/thead&gt;
+ &lt;tbody&gt;
+ &lt;tr&gt;
+ &lt;td&gt;value&lt;/td&gt;
+ &lt;td&gt;no&lt;/td&gt;
+ &lt;td&gt;id&lt;/td&gt;
+ &lt;td&gt;The key property value.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/tbody&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.util.KeyProperty</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ // The key property for User objects within the users collection is the &lt;code&gt;userName&lt;/code&gt; attribute.
+ &amp;#64;KeyProperty( value = "userName" )
+ protected List&amp;lt;User&amp;gt; users = null;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/logger-interceptor.html b/content/core-developers/logger-interceptor.html
index efced85..e03770c 100644
--- a/content/core-developers/logger-interceptor.html
+++ b/content/core-developers/logger-interceptor.html
@@ -129,26 +129,46 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/logger-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="logger-interceptor">Logger Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.LoggingInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ This interceptor logs the start and end of the execution an action (in English-only, not internationalized).
+ &lt;br&gt;
+ &lt;b&gt;Note:&lt;/b&gt;: This interceptor will log at &lt;tt&gt;INFO&lt;/tt&gt; level.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.LoggingInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> There are no parameters for this interceptor.
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=com.opensymphony.xwork2.interceptor.LoggingInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> There are no obvious extensions to the existing interceptor.
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=com.opensymphony.xwork2.interceptor.LoggingInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;!-- prints out a message before and after the immediate action execution --&amp;gt;
+ &amp;lt;action name=&amp;quot;someAction&amp;quot; class=&amp;quot;com.examples.SomeAction&amp;quot;&amp;gt;
+     &amp;lt;interceptor-ref name=&amp;quot;completeStack&amp;quot;/&amp;gt;
+     &amp;lt;interceptor-ref name=&amp;quot;logger&amp;quot;/&amp;gt;
+     &amp;lt;result name=&amp;quot;success&amp;quot;&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+
+ &amp;lt;!-- prints out a message before any more interceptors continue and after they have finished --&amp;gt;
+ &amp;lt;action name=&amp;quot;someAction&amp;quot; class=&amp;quot;com.examples.SomeAction&amp;quot;&amp;gt;
+     &amp;lt;interceptor-ref name=&amp;quot;logger&amp;quot;/&amp;gt;
+     &amp;lt;interceptor-ref name=&amp;quot;completeStack&amp;quot;/&amp;gt;
+     &amp;lt;result name=&amp;quot;success&amp;quot;&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/parameter-filter-interceptor.html b/content/core-developers/parameter-filter-interceptor.html
index 62dbeff..aa915c6 100644
--- a/content/core-developers/parameter-filter-interceptor.html
+++ b/content/core-developers/parameter-filter-interceptor.html
@@ -129,14 +129,50 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/parameter-filter-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="parameter-filter-interceptor">Parameter Filter Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.ParameterFilterInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ The Parameter Filter Interceptor blocks parameters from getting
+ to the rest of the stack or your action. You can use multiple 
+ parameter filter interceptors for a given action, so, for example,
+ you could use one in your default stack that filtered parameters
+ you wanted blocked from every action and those you wanted blocked 
+ from an individual action you could add an additional interceptor
+ for each action.
+ 
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.ParameterFilterInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+ &lt;li&gt;allowed - a comma delimited list of parameter prefixes
+  that are allowed to pass to the action&lt;/li&gt;
+ &lt;li&gt;blocked - a comma delimited list of parameter prefixes 
+ that are not allowed to pass to the action&lt;/li&gt;
+ &lt;li&gt;defaultBlock - boolean (default to false) whether by
+ default a given parameter is blocked. If true, then a parameter
+ must have a prefix in the allowed list in order to be able 
+ to pass to the action
+ &lt;/ul&gt;
+ 
+ &lt;p&gt;The way parameters are filtered for the least configuration is that
+ if a string is in the allowed or blocked lists, then any parameter
+ that is a member of the object represented by the parameter is allowed
+ or blocked respectively.&lt;/p&gt;
+ 
+ &lt;p&gt;For example, if the parameters are:
+ &lt;ul&gt;
+ &lt;li&gt;blocked: person,person.address.createDate,personDao&lt;/li&gt;
+ &lt;li&gt;allowed: person.address&lt;/li&gt;
+ &lt;li&gt;defaultBlock: false&lt;/li&gt;
+ &lt;/ul&gt;
+
+ &lt;p&gt;
+ The parameters person.name, person.phoneNum etc would be blocked 
+ because 'person' is in the blocked list. However, person.address.street
+ and person.address.city would be allowed because person.address is
+ in the allowed list (the longer string determines permissions).&lt;/p&gt; 
+</code></pre>
 </div>
 
 <p>#####Example#####</p>
diff --git a/content/core-developers/postback-result.html b/content/core-developers/postback-result.html
index 95a0164..8d32944 100644
--- a/content/core-developers/postback-result.html
+++ b/content/core-developers/postback-result.html
@@ -131,20 +131,24 @@
 
 <p>####Description####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.dispatcher.PostbackResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: description not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/dispatcher/PostbackResult.java;hb=HEAD
+</code></pre>
 </div>
 
 <p>####Parameters####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=params|javadoc=true|url=org.apache.struts2.dispatcher.PostbackResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: params not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/dispatcher/PostbackResult.java;hb=HEAD
+</code></pre>
 </div>
 
 <p>####Examples####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.dispatcher.PostbackResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/dispatcher/PostbackResult.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/prepare-interceptor.html b/content/core-developers/prepare-interceptor.html
index dc4e71e..22480d9 100644
--- a/content/core-developers/prepare-interceptor.html
+++ b/content/core-developers/prepare-interceptor.html
@@ -129,30 +129,86 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/prepare-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="prepare-interceptor">Prepare Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.PrepareInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ This interceptor calls &lt;code&gt;prepare()&lt;/code&gt; on actions which implement
+ {@link Preparable}. This interceptor is very useful for any situation where
+ you need to ensure some logic runs before the actual execute method runs.
+
+ &lt;p&gt;
+ A typical use of this is to run some logic to load an object from the
+ database so that when parameters are set they can be set on this object. For
+ example, suppose you have a User object with two properties: &lt;i&gt;id&lt;/i&gt; and
+ &lt;i&gt;name&lt;/i&gt;. Provided that the params interceptor is called twice (once
+ before and once after this interceptor), you can load the User object using
+ the id property, and then when the second params interceptor is called the
+ parameter &lt;i&gt;user.name&lt;/i&gt; will be set, as desired, on the actual object
+ loaded from the database. See the example for more info.
+ &lt;/p&gt;
+ &lt;p&gt;
+ &lt;b&gt;Note:&lt;/b&gt; Since XWork 2.0.2, this interceptor extends {@link MethodFilterInterceptor}, therefore being
+ able to deal with excludeMethods / includeMethods parameters. See [Workflow Interceptor]
+ (class {@link DefaultWorkflowInterceptor}) for documentation and examples on how to use this feature.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;Update&lt;/b&gt;: Added logic to execute a prepare{MethodName} and conditionally
+ the a general prepare() Method, depending on the 'alwaysInvokePrepare' parameter/property
+ which is by default true. This allows us to run some logic based on the method
+ name we specify in the {@link com.opensymphony.xwork2.ActionProxy}. For example, you can specify a
+ prepareInput() method that will be run before the invocation of the input method.
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadocPrepareInterceptor|javadoc=true|url=com.opensymphony.xwork2.interceptor.PrefixMethodInvocationUtil</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> 
+ &lt;b&gt;In PrepareInterceptor&lt;/b&gt;
+ &lt;p&gt;Applies only when action implements Preparable&lt;/p&gt;
+ &lt;ol&gt;
+    &lt;li&gt;if the action class have prepare{MethodName}(), it will be invoked&lt;/li&gt;
+    &lt;li&gt;else if the action class have prepareDo(MethodName()}(), it will be invoked&lt;/li&gt;
+    &lt;li&gt;no matter if 1] or 2] is performed, if alwaysinvokePrepare property of the interceptor is "true" (which is by default "true"), prepare() will be invoked.&lt;/li&gt;
+ &lt;/ol&gt;
+ 
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.PrepareInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;alwaysInvokePrepare - Default to true. If true, prepare will always be invoked,
+ otherwise it will not.&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=com.opensymphony.xwork2.interceptor.PrepareInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ There are no known extension points to this interceptor.
+
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=com.opensymphony.xwork2.interceptor.PrepareInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;!-- Calls the params interceptor twice, allowing you to
+       pre-load data for the second time parameters are set --&amp;gt;
+  &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+      &amp;lt;interceptor-ref name="params"/&amp;gt;
+      &amp;lt;interceptor-ref name="prepare"/&amp;gt;
+      &amp;lt;interceptor-ref name="basicStack"/&amp;gt;
+      &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+  &amp;lt;/action&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/pure-java-script-client-side-validation.html b/content/core-developers/pure-java-script-client-side-validation.html
index ba9a60d..82df6e8 100644
--- a/content/core-developers/pure-java-script-client-side-validation.html
+++ b/content/core-developers/pure-java-script-client-side-validation.html
@@ -134,8 +134,8 @@ This type of validation uses 100% client-side JavaScript code to try to validate
 Because the validation logic is actually repeated in the JavaScript code, it is important to understand that 
 some values will be considered acceptable by the JavaScript code but will be marked as unacceptable by the server-side <a href="validation.html">Validation</a>.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=supported-validators|url=struts2/core/src/main/resources/template/xhtml/form-close-validate.ftl</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: supported-validators not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/core/src/main/resources/template/xhtml/form-close-validate/ftl.java;hb=HEAD
+</code></pre>
 </div>
 
 <blockquote>
diff --git a/content/core-developers/redirect-action-result.html b/content/core-developers/redirect-action-result.html
index a17b7c0..869d8f4 100644
--- a/content/core-developers/redirect-action-result.html
+++ b/content/core-developers/redirect-action-result.html
@@ -129,8 +129,23 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/redirect-action-result.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="redirect-action-result">Redirect Action Result</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.result.ServletActionRedirectResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ This result uses the {@link ActionMapper} provided by the
+ ActionMapperFactory to redirect the browser to a URL that invokes the
+ specified action and (optional) namespace. This is better than the
+ {@link ServletRedirectResult} because it does not require you to encode the
+ URL patterns processed by the {@link ActionMapper} in to your struts.xml
+ configuration files. This means you can change your URL patterns at any point
+ and your application will still work. It is strongly recommended that if you
+ are redirecting to another action, you use this result rather than the
+ standard redirect result.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ See examples below for an example of how request parameters could be passed
+ in.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>See <a href="action-mapper.html">ActionMapper</a> for more details</p>
@@ -144,14 +159,75 @@
 
 <p>####Parameters####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=params|javadoc=true|url=org.apache.struts2.result.ServletActionRedirectResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+ &lt;li&gt;&lt;b&gt;actionName (default)&lt;/b&gt; - The name of the action that will be
+ redirected to.&lt;/li&gt;
+ &lt;li&gt;&lt;b&gt;namespace&lt;/b&gt; - Used to determine which namespace the action is in
+ that we're redirecting to.  If namespace is null, the default will be the
+ current namespace.&lt;/li&gt;
+ &lt;li&gt;&lt;b&gt;suppressEmptyParameters&lt;/b&gt; - Optional boolean (defaults to false) that
+ can prevent parameters with no values from being included in the redirect
+ URL.&lt;/li&gt;
+ &lt;li&gt;&lt;b&gt;parse&lt;/b&gt; - Boolean, true by default.  If set to false, the actionName
+ param will not be parsed for Ognl expressions.&lt;/li&gt;
+ &lt;li&gt;&lt;b&gt;anchor&lt;/b&gt; - Optional.  Also known as "fragment" or colloquially as
+ "hash".  You can specify an anchor for a result.&lt;/li&gt;
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>####Examples####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.result.ServletActionRedirectResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;package name="public" extends="struts-default"&amp;gt;
+     &amp;lt;action name="login" class="..."&amp;gt;
+         &amp;lt;!-- Redirect to another namespace --&amp;gt;
+         &amp;lt;result type="redirectAction"&amp;gt;
+             &amp;lt;param name="actionName"&amp;gt;dashboard&amp;lt;/param&amp;gt;
+             &amp;lt;param name="namespace"&amp;gt;/secure&amp;lt;/param&amp;gt;
+         &amp;lt;/result&amp;gt;
+     &amp;lt;/action&amp;gt;
+ &amp;lt;/package&amp;gt;
+
+ &amp;lt;package name="secure" extends="struts-default" namespace="/secure"&amp;gt;
+     &amp;lt;-- Redirect to an action in the same namespace --&amp;gt;
+     &amp;lt;action name="dashboard" class="..."&amp;gt;
+         &amp;lt;result&amp;gt;dashboard.jsp&amp;lt;/result&amp;gt;
+         &amp;lt;result name="error" type="redirectAction"&amp;gt;error&amp;lt;/result&amp;gt;
+     &amp;lt;/action&amp;gt;
+
+     &amp;lt;action name="error" class="..."&amp;gt;
+         &amp;lt;result&amp;gt;error.jsp&amp;lt;/result&amp;gt;
+     &amp;lt;/action&amp;gt;
+ &amp;lt;/package&amp;gt;
+
+ &amp;lt;package name="passingRequestParameters" extends="struts-default" namespace="/passingRequestParameters"&amp;gt;
+    &amp;lt;!-- Pass parameters (reportType, width and height) --&amp;gt;
+    &amp;lt;!--
+    The redirectAction url generated will be :
+    /genReport/generateReport.action?reportType=pie&amp;amp;width=100&amp;amp;height=100#summary
+    --&amp;gt;
+    &amp;lt;action name="gatherReportInfo" class="..."&amp;gt;
+       &amp;lt;result name="showReportResult" type="redirectAction"&amp;gt;
+          &amp;lt;param name="actionName"&amp;gt;generateReport&amp;lt;/param&amp;gt;
+          &amp;lt;param name="namespace"&amp;gt;/genReport&amp;lt;/param&amp;gt;
+          &amp;lt;param name="reportType"&amp;gt;pie&amp;lt;/param&amp;gt;
+          &amp;lt;param name="width"&amp;gt;100&amp;lt;/param&amp;gt;
+          &amp;lt;param name="height"&amp;gt;100&amp;lt;/param&amp;gt;
+          &amp;lt;param name="empty"&amp;gt;&amp;lt;/param&amp;gt;
+          &amp;lt;param name="suppressEmptyParameters"&amp;gt;true&amp;lt;/param&amp;gt;
+          &amp;lt;param name="anchor"&amp;gt;summary&amp;lt;/param&amp;gt;
+       &amp;lt;/result&amp;gt;
+    &amp;lt;/action&amp;gt;
+ &amp;lt;/package&amp;gt;
+
+
+```
+
+</code></pre>
 </div>
 
 <div class="highlighter-rouge"><pre class="highlight"><code>&lt;!--
diff --git a/content/core-developers/redirect-result.html b/content/core-developers/redirect-result.html
index e340849..197bad7 100644
--- a/content/core-developers/redirect-result.html
+++ b/content/core-developers/redirect-result.html
@@ -129,20 +129,56 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/redirect-result.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="redirect-result">Redirect Result</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.result.ServletRedirectResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Calls the {@link HttpServletResponse#sendRedirect(String) sendRedirect}
+ method to the location specified. The response is told to redirect the
+ browser to the specified location (a new request from the client). The
+ consequence of doing this means that the action (action instance, action
+ errors, field errors, etc) that was just executed is lost and no longer
+ available. This is because actions are built on a single-thread model. The
+ only way to pass data is through the session or with web parameters
+ (url?name=value) which can be OGNL expressions.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>####Parameters####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=params|javadoc=true|url=org.apache.struts2.result.ServletRedirectResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> 
+ &lt;ul&gt;
+ 
+ &lt;li&gt;&lt;b&gt;location (default)&lt;/b&gt; - the location to go to after execution.&lt;/li&gt;
+ 
+ &lt;li&gt;&lt;b&gt;parse&lt;/b&gt; - true by default. If set to false, the location param will
+ not be parsed for Ognl expressions.&lt;/li&gt;
+ 
+ &lt;li&gt;&lt;b&gt;anchor&lt;/b&gt; - Optional.  Also known as "fragment" or colloquially as 
+ "hash".  You can specify an anchor for a result.&lt;/li&gt;
+ &lt;/ul&gt;
+ 
+ &lt;p&gt;
+ This result follows the same rules from {@link StrutsResultSupport}.
+ &lt;/p&gt;
+ 
+</code></pre>
 </div>
 
 <p>####Examples####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.result.ServletRedirectResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;!--
+   The redirect URL generated will be:
+   /foo.jsp#FRAGMENT
+ --&amp;gt;
+ &amp;lt;result name="success" type="redirect"&amp;gt;
+   &amp;lt;param name="location"&amp;gt;foo.jsp&amp;lt;/param&amp;gt;
+   &amp;lt;param name="parse"&amp;gt;false&amp;lt;/param&amp;gt;
+   &amp;lt;param name="anchor"&amp;gt;FRAGMENT&amp;lt;/param&amp;gt;
+ &amp;lt;/result&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <div class="highlighter-rouge"><pre class="highlight"><code>&lt;package name="passingRequestParameters" extends="struts-default" namespace="/passingRequestParameters"&gt;
diff --git a/content/core-developers/regex-field-validator-annotation.html b/content/core-developers/regex-field-validator-annotation.html
index 73e486f..6fbb9fc 100644
--- a/content/core-developers/regex-field-validator-annotation.html
+++ b/content/core-developers/regex-field-validator-annotation.html
@@ -129,26 +129,79 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/regex-field-validator-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="regexfieldvalidator-annotation">RegexFieldValidator Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.RegexFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Validates a string field using a regular expression.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.RegexFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The annotation must be applied at method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.RegexFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;message&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;field error message&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;key&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;i18n key from language specific properties file.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;messageParams&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Additional params to be used to customize message - will be evaluated against the Value Stack&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;fieldName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;shortCircuit&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;If this validator should be used as shortCircuit.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;type&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;ValidatorType.FIELD&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Enum value from ValidatorType. Either FIELD or SIMPLE can be used here.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;regex&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;The regex to validate the field value against.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.RegexFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;RegexFieldValidator( key = "regex.field", regex = "yourregexp")
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/required-field-validator-annotation.html b/content/core-developers/required-field-validator-annotation.html
index 9714202..4c8c245 100644
--- a/content/core-developers/required-field-validator-annotation.html
+++ b/content/core-developers/required-field-validator-annotation.html
@@ -129,26 +129,73 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/required-field-validator-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="requiredfieldvalidator-annotation">RequiredFieldValidator Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This validator checks that a field is non-null.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The annotation must be applied at method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;message&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;field error message&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;key&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;i18n key from language specific properties file.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;messageParams&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Additional params to be used to customize message - will be evaluated against the Value Stack&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;fieldName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;shortCircuit&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;If this validator should be used as shortCircuit.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;type&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;ValidatorType.FIELD&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Enum value from ValidatorType. Either FIELD or SIMPLE can be used here.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;RequiredFieldValidator(message = "Default message", key = "i18n.key", shortCircuit = true)
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/required-string-validator-annotation.html b/content/core-developers/required-string-validator-annotation.html
index abf752e..aa92fda 100644
--- a/content/core-developers/required-string-validator-annotation.html
+++ b/content/core-developers/required-string-validator-annotation.html
@@ -129,26 +129,79 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/required-string-validator-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="requiredstringvalidator-annotation">RequiredStringValidator Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.RequiredStringValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This validator checks that a String field is not empty (i.e. non-null with a length &amp;gt; 0).
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.RequiredStringValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The annotation must be applied at method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.RequiredStringValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;message&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;field error message&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;key&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;i18n key from language specific properties file.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;messageParams&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Additional params to be used to customize message - will be evaluated against the Value Stack&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;fieldName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;shortCircuit&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;If this validator should be used as shortCircuit.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;type&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;ValidatorType.FIELD&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Enum value from ValidatorType. Either FIELD or SIMPLE can be used here.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; trim &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; true &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Boolean property.  Determines whether the String is trimmed before performing the length check.  &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.RequiredStringValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;RequiredStringValidator(message = "Default message", key = "i18n.key", shortCircuit = true, trim = true)
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/roles-interceptor.html b/content/core-developers/roles-interceptor.html
index eec154d..9197911 100644
--- a/content/core-developers/roles-interceptor.html
+++ b/content/core-developers/roles-interceptor.html
@@ -129,20 +129,41 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/roles-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="roles-interceptor">Roles Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.interceptor.RolesInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ This interceptor ensures that the action will only be executed if the user has the correct role.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.RolesInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;allowedRoles - a comma-separated list of roles to allow&lt;/li&gt;
+
+ &lt;li&gt;disallowedRoles - a comma-separated list of roles to disallow&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+ &lt;p&gt;
+ When both allowedRoles and disallowedRoles are configured, then disallowedRoles
+ takes precedence, applying the following logic: 
+  (if ((inRole(role1) || inRole(role2) || ... inRole(roleN)) &amp;amp;&amp;amp;
+       !inRole(roleA) &amp;amp;&amp;amp; !inRole(roleB) &amp;amp;&amp;amp; ... !inRole(roleZ))
+  { //permit ...
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.interceptor.RolesInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/scope-interceptor.html b/content/core-developers/scope-interceptor.html
index 03d1014..26b5171 100644
--- a/content/core-developers/scope-interceptor.html
+++ b/content/core-developers/scope-interceptor.html
@@ -129,26 +129,109 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/scope-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="scope-interceptor">Scope Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.interceptor.ScopeInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ This is designed to solve a few simple issues related to wizard-like functionality in Struts. One of those issues is
+ that some applications have a application-wide parameters commonly used, such &lt;i&gt;pageLen&lt;/i&gt; (used for records per
+ page). Rather than requiring that each action check if such parameters are supplied, this interceptor can look for
+ specified parameters and pull them out of the session.
+ &lt;/p&gt;
+
+ &lt;p&gt;This works by setting listed properties at action start with values from session/application attributes keyed
+ after the action's class, the action's name, or any supplied key. After action is executed all the listed properties
+ are taken back and put in session or application context.
+ &lt;/p&gt;
+
+ &lt;p&gt;To make sure that each execution of the action is consistent it makes use of session-level locking. This way it
+ guarantees that each action execution is atomic at the session level. It doesn't guarantee application level
+ consistency however there has yet to be enough reasons to do so. Application level consistency would also be a big
+ performance overkill.
+ &lt;/p&gt;
+
+ &lt;p&gt;Note that this interceptor takes a snapshot of action properties just before result is presented (using a {@link
+ PreResultListener}), rather than after action is invoked. There is a reason for that: At this moment we know that
+ action's state is "complete" as it's values may depend on the rest of the stack and specifically - on the values of
+ nested interceptors.
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.ScopeInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;session - a list of action properties to be bound to session scope&lt;/li&gt;
+
+ &lt;li&gt;application - a list of action properties to be bound to application scope&lt;/li&gt;
+
+ &lt;li&gt;key - a session/application attribute key prefix, can contain following values:
+
+ &lt;ul&gt;
+
+ &lt;li&gt;CLASS - that creates a unique key prefix based on action namespace and action class, it's a default value&lt;/li&gt;
+
+ &lt;li&gt;ACTION - creates a unique key prefix based on action namespace and action name&lt;/li&gt;
+
+ &lt;li&gt;any other value is taken literally as key prefix&lt;/li&gt;
+
+ &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;type - with one of the following
+
+ &lt;ul&gt;
+
+ &lt;li&gt;start - means it's a start action of the wizard-like action sequence and all session scoped properties are reset
+ to their defaults&lt;/li&gt;
+
+ &lt;li&gt;end - means that session scoped properties are removed from session after action is run&lt;/li&gt;
+
+ &lt;li&gt;any other value throws IllegalArgumentException&lt;/li&gt;
+
+ &lt;/ul&gt;
+ &lt;/li&gt;
+
+ &lt;li&gt;sessionReset - name of a parameter (defaults to 'session.reset') which if set, causes all session values to be reset to action's default values or application
+ scope values, note that it is similar to type="start" and in fact it does the same, but in our team it is sometimes
+ semantically preferred. We use session scope in two patterns - sometimes there are wizard-like action sequences that
+ have start and end, and sometimes we just want simply reset current session values.&lt;/li&gt;
+
+ &lt;li&gt;reset - boolean, defaults to false, if set, it has the same effect as setting all session values to be reset to action's default values or application.&lt;/li&gt;
+
+ &lt;li&gt;autoCreateSession - boolean value, sets if the session should be automatically created.&lt;/li&gt;
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=org.apache.struts2.interceptor.ScopeInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;There are no know extension points for this interceptor.&lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.interceptor.ScopeInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;!-- As the filter and orderBy parameters are common for all my browse-type actions,
+      you can move control to the scope interceptor. In the session parameter you can list
+      action properties that are going to be automatically managed over session. You can
+      do the same for application-scoped variables--&amp;gt;
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="basicStack"/&amp;gt;
+     &amp;lt;interceptor-ref name="hibernate"/&amp;gt;
+     &amp;lt;interceptor-ref name="scope"&amp;gt;
+         &amp;lt;param name="session"&amp;gt;filter,orderBy&amp;lt;/param&amp;gt;
+         &amp;lt;param name="autoCreateSession"&amp;gt;true&amp;lt;/param&amp;gt;
+     &amp;lt;/interceptor-ref&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p><strong>Some more examples</strong></p>
diff --git a/content/core-developers/scoped-model-driven-interceptor.html b/content/core-developers/scoped-model-driven-interceptor.html
index a8ce0f1..2283dad 100644
--- a/content/core-developers/scoped-model-driven-interceptor.html
+++ b/content/core-developers/scoped-model-driven-interceptor.html
@@ -129,26 +129,57 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/scoped-model-driven-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="scoped-model-driven-interceptor">Scoped Model Driven Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ An interceptor that enables scoped model-driven actions.
+
+ &lt;p&gt;This interceptor only activates on actions that implement the {@link ScopedModelDriven} interface.  If
+ detected, it will retrieve the model class from the configured scope, then provide it to the Action.&lt;/p&gt;
+  
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;className - The model class name.  Defaults to the class name of the object returned by the getModel() method.&lt;/li&gt;
+            
+ &lt;li&gt;name - The key to use when storing or retrieving the instance in a scope.  Defaults to the model
+            class name.&lt;/li&gt;
+
+ &lt;li&gt;scope - The scope to store and retrieve the model.  Defaults to 'request' but can also be 'session'.&lt;/li&gt;
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ There are no known extension points for this interceptor.
+
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ 
+ &amp;lt;-- Basic usage --&amp;gt;
+ &amp;lt;interceptor name="scopedModelDriven" class="com.opensymphony.interceptor.ScopedModelDrivenInterceptor" /&amp;gt;
+ 
+ &amp;lt;-- Using all available parameters --&amp;gt;
+ &amp;lt;interceptor name="gangsterForm" class="com.opensymphony.interceptor.ScopedModelDrivenInterceptor"&amp;gt;
+      &amp;lt;param name="scope"&amp;gt;session&amp;lt;/param&amp;gt;
+      &amp;lt;param name="name"&amp;gt;gangsterForm&amp;lt;/param&amp;gt;
+      &amp;lt;param name="className"&amp;gt;com.opensymphony.example.GangsterForm&amp;lt;/param&amp;gt;
+  &amp;lt;/interceptor&amp;gt;
+ 
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/servlet-config-interceptor.html b/content/core-developers/servlet-config-interceptor.html
index 53febe4..64497f9 100644
--- a/content/core-developers/servlet-config-interceptor.html
+++ b/content/core-developers/servlet-config-interceptor.html
@@ -129,26 +129,72 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/servlet-config-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="servlet-config-interceptor">Servlet Config Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.interceptor.ServletConfigInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ An interceptor which sets action properties based on the interfaces an action implements. For example, if the action
+ implements {@link ParameterAware} then the action context's parameter map will be set on it.
+ &lt;/p&gt;
+
+ &lt;p&gt;This interceptor is designed to set all properties an action needs if it's aware of servlet parameters, the
+ servlet context, the session, etc. Interfaces that it supports are:
+ &lt;/p&gt;
+
+ &lt;ul&gt;
+
+ &lt;li&gt;{@link ServletContextAware}&lt;/li&gt;
+
+ &lt;li&gt;{@link ServletRequestAware}&lt;/li&gt;
+
+ &lt;li&gt;{@link ServletResponseAware}&lt;/li&gt;
+
+ &lt;li&gt;{@link ParameterAware} - deprecated since 2.5.4, please use {@link HttpParametersAware}&lt;/li&gt;
+
+ &lt;li&gt;{@link HttpParametersAware}&lt;/li&gt;
+
+ &lt;li&gt;{@link RequestAware}&lt;/li&gt;
+
+ &lt;li&gt;{@link SessionAware}&lt;/li&gt;
+
+ &lt;li&gt;{@link ApplicationAware}&lt;/li&gt;
+
+ &lt;li&gt;{@link PrincipalAware}&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.ServletConfigInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;None&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=org.apache.struts2.interceptor.ServletConfigInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;There are no known extension points for this interceptor.&lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.interceptor.ServletConfigInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="servletConfig"/&amp;gt;
+     &amp;lt;interceptor-ref name="basicStack"/&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/static-parameters-interceptor.html b/content/core-developers/static-parameters-interceptor.html
index aaf7169..a17f8b5 100644
--- a/content/core-developers/static-parameters-interceptor.html
+++ b/content/core-developers/static-parameters-interceptor.html
@@ -129,26 +129,50 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/static-parameters-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="static-parameters-interceptor">Static Parameters Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.StaticParametersInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ This interceptor populates the action with the static parameters defined in the action configuration. If the action
+ implements {@link Parameterizable}, a map of the static parameters will be also be passed directly to the action.
+ The static params will be added to the request params map, unless "merge" is set to false.
+
+ &lt;p&gt; Parameters are typically defined with &amp;lt;param&amp;gt; elements within xwork.xml.&lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.StaticParametersInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;None&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=com.opensymphony.xwork2.interceptor.StaticParametersInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;There are no extension points to this interceptor.&lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=com.opensymphony.xwork2.interceptor.StaticParametersInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="staticParams"&amp;gt;
+          &amp;lt;param name="parse"&amp;gt;true&amp;lt;/param&amp;gt;
+          &amp;lt;param name="overwrite"&amp;gt;false&amp;lt;/param&amp;gt;
+     &amp;lt;/interceptor-ref&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/string-length-field-validator-annotation.html b/content/core-developers/string-length-field-validator-annotation.html
index 74c46ee..bf0eddb 100644
--- a/content/core-developers/string-length-field-validator-annotation.html
+++ b/content/core-developers/string-length-field-validator-annotation.html
@@ -129,26 +129,107 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/string-length-field-validator-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="stringlengthfieldvalidator-annotation">StringLengthFieldValidator Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This validator checks that a String field is of the right length. It assumes that the field is a String.
+ If neither minLength nor maxLength is set, nothing will be done.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The annotation must be applied at method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;message&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;field error message&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;key&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;i18n key from language specific properties file.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;messageParams&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Additional params to be used to customize message - will be evaluated against the Value Stack&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;fieldName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;shortCircuit&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;If this validator should be used as shortCircuit.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;type&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;ValidatorType.FIELD&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Enum value from ValidatorType. Either FIELD or SIMPLE can be used here.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; trim &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; true &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Boolean property.  Determines whether the String is trimmed before performing the length check.  &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; minLength &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Integer property.  The minimum length the String must be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; minLengthExpression &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;OGNL expression used to obtain the minimum length the String must be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; maxLength &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Integer property.  The maximum length the String can be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; maxLengthExpression &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;OGNL expression used to obtain the maximum length the String can be. &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+
+ &lt;p&gt;If neither &lt;em&gt;minLength&lt;/em&gt; nor &lt;em&gt;maxLength&lt;/em&gt; is set, nothing will be done.&lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;StringLengthFieldValidator(message = "Default message", key = "i18n.key", shortCircuit = true, trim = true, minLength = "5",  maxLength = "12")
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/timer-interceptor.html b/content/core-developers/timer-interceptor.html
index 9041ef9..ad56af2 100644
--- a/content/core-developers/timer-interceptor.html
+++ b/content/core-developers/timer-interceptor.html
@@ -129,26 +129,57 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/timer-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="timer-interceptor">Timer Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.TimerInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This interceptor logs the amount of time in milliseconds. In order for this interceptor to work properly, the
+ logging framework must be set to at least the &lt;tt&gt;INFO&lt;/tt&gt; level.
+ This interceptor relies on the &lt;a href="http://jakarta.apache.org/commons/logging/"&gt;Commons Logging API&lt;/a&gt; to
+ report its execution-time value.
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.TimerInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;logLevel (optional) - what log level should we use (&lt;code&gt;trace, debug, info, warn, error, fatal&lt;/code&gt;)? - defaut is &lt;code&gt;info&lt;/code&gt;&lt;/li&gt;
+
+ &lt;li&gt;logCategory (optional) - If provided we would use this category (eg. &lt;code&gt;com.mycompany.app&lt;/code&gt;).
+ Default is to use &lt;code&gt;com.opensymphony.xwork2.interceptor.TimerInterceptor&lt;/code&gt;.&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+ The parameters above enables us to log all action execution times in our own logfile.
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=com.opensymphony.xwork2.interceptor.TimerInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This interceptor can be extended to provide custom message format. Users should override the
+ &lt;code&gt;invokeUnderTiming&lt;/code&gt; method.
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=com.opensymphony.xwork2.interceptor.TimerInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;!-- records only the action's execution time --&amp;gt;
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="completeStack"/&amp;gt;
+     &amp;lt;interceptor-ref name="timer"/&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+
+ &amp;lt;!-- records action's execution time as well as other interceptors--&amp;gt;
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="timer"/&amp;gt;
+     &amp;lt;interceptor-ref name="completeStack"/&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/token-interceptor.html b/content/core-developers/token-interceptor.html
index 6b23045..9e0d28b 100644
--- a/content/core-developers/token-interceptor.html
+++ b/content/core-developers/token-interceptor.html
@@ -129,26 +129,85 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/token-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="token-interceptor">Token Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.interceptor.TokenInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Ensures that only one request per token is processed. This interceptor can make sure that back buttons and double
+ clicks don't cause un-intended side affects. For example, you can use this to prevent careless users who might double
+ click on a "checkout" button at an online store. This interceptor uses a fairly primitive technique for when an
+ invalid token is found: it returns the result &lt;b&gt;invalid.token&lt;/b&gt;, which can be mapped in your action configuration.
+ A more complex implementation, {@link TokenSessionStoreInterceptor}, can provide much better logic for when invalid
+ tokens are found.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;Note:&lt;/b&gt; To set a token in your form, you should use the &lt;b&gt;token tag&lt;/b&gt;. This tag is required and must be used
+ in the forms that submit to actions protected by this interceptor. Any request that does not provide a token (using
+ the token tag) will be processed as a request with an invalid token.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;Internationalization Note:&lt;/b&gt; The following key could be used to internationalized the action errors generated
+ by this token interceptor
+ &lt;/p&gt;
+
+ &lt;ul&gt;
+    &lt;li&gt;struts.messages.invalid.token&lt;/li&gt;
+ &lt;/ul&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;NOTE:&lt;/b&gt; As this method extends off MethodFilterInterceptor, it is capable of
+ deciding if it is applicable only to selective methods in the action class. See
+ &lt;code&gt;MethodFilterInterceptor&lt;/code&gt; for more info.
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.TokenInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;None&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=org.apache.struts2.interceptor.TokenInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ While not very common for users to extend, this interceptor is extended by the {@link TokenSessionStoreInterceptor}.
+ The {@link #handleInvalidToken}  and {@link #handleValidToken} methods are protected and available for more
+ interesting logic, such as done with the token session interceptor.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.interceptor.TokenInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="token"/&amp;gt;
+     &amp;lt;interceptor-ref name="basicStack"/&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+
+ &amp;lt;-- In this case, myMethod of the action class will not
+        get checked for invalidity of token --&amp;gt;
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="token"&amp;gt;
+        &amp;lt;param name="excludeMethods"&amp;gt;myMethod&amp;lt;/param&amp;gt;
+     &amp;lt;/interceptor-ref name="token"/&amp;gt;
+     &amp;lt;interceptor-ref name="basicStack"/&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
 
diff --git a/content/core-developers/token-session-interceptor.html b/content/core-developers/token-session-interceptor.html
index 425a5f9..cc6e3a3 100644
--- a/content/core-developers/token-session-interceptor.html
+++ b/content/core-developers/token-session-interceptor.html
@@ -129,26 +129,68 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/token-session-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="token-session-interceptor">Token Session Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.interceptor.TokenSessionStoreInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ This interceptor builds off of the {@link TokenInterceptor}, providing advanced logic for handling invalid tokens.
+ Unlike the normal token interceptor, this interceptor will attempt to provide intelligent fail-over in the event of
+ multiple requests using the same session. That is, it will block subsequent requests until the first request is
+ complete, and then instead of returning the &lt;i&gt;invalid.token&lt;/i&gt; code, it will attempt to display the same response
+ that the original, valid action invocation would have displayed if no multiple requests were submitted in the first
+ place.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;NOTE:&lt;/b&gt; As this method extends off MethodFilterInterceptor, it is capable of
+ deciding if it is applicable only to selective methods in the action class. See
+ &lt;code&gt;MethodFilterInterceptor&lt;/code&gt; for more info.
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=org.apache.struts2.interceptor.TokenSessionStoreInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;None&lt;/li&gt;
+
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=org.apache.struts2.interceptor.TokenSessionStoreInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ There are no known extension points for this interceptor.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.interceptor.TokenSessionStoreInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="tokenSession/&amp;gt;
+     &amp;lt;interceptor-ref name="basicStack"/&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+
+ &amp;lt;-- In this case, myMethod of the action class will not
+        get checked for invalidity of token --&amp;gt;
+ &amp;lt;action name="someAction" class="com.examples.SomeAction"&amp;gt;
+     &amp;lt;interceptor-ref name="tokenSession&amp;gt;
+         &amp;lt;param name="excludeMethods"&amp;gt;myMethod&amp;lt;/param&amp;gt;
+     &amp;lt;/interceptor-ref name="tokenSession&amp;gt;
+     &amp;lt;interceptor-ref name="basicStack"/&amp;gt;
+     &amp;lt;result name="success"&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/type-conversion-annotation.html b/content/core-developers/type-conversion-annotation.html
index b50eeaf..fc58b90 100644
--- a/content/core-developers/type-conversion-annotation.html
+++ b/content/core-developers/type-conversion-annotation.html
@@ -129,26 +129,125 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/type-conversion-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="typeconversion-annotation">TypeConversion Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.conversion.annotations.TypeConversion</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;This annotation is used for class and application wide conversion rules.&lt;/p&gt;
+
+ &lt;p&gt;
+ Class wide conversion:&lt;br&gt;
+ The conversion rules will be assembled in a file called &lt;code&gt;XXXAction-conversion.properties&lt;/code&gt;
+ within the same package as the related action class.
+ Set type to: &lt;code&gt;type = ConversionType.CLASS&lt;/code&gt;
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ Application wide conversion:&lt;br&gt;
+ The conversion rules will be assembled within the &lt;code&gt;xwork-conversion.properties&lt;/code&gt; file within the classpath root.
+ Set type to: &lt;code&gt;type = ConversionType.APPLICATION&lt;/code&gt;
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.conversion.annotations.TypeConversion</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The TypeConversion annotation can be applied at property and method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.conversion.annotations.TypeConversion</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table summary=""&gt;
+ &lt;thead&gt;
+ &lt;tr&gt;
+ &lt;th&gt;Parameter&lt;/th&gt;
+ &lt;th&gt;Required&lt;/th&gt;
+ &lt;th&gt;Default&lt;/th&gt;
+ &lt;th&gt;Description&lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;/thead&gt;
+ &lt;tbody&gt;
+ &lt;tr&gt;
+ &lt;td&gt;key&lt;/td&gt;
+ &lt;td&gt;no&lt;/td&gt;
+ &lt;td&gt;The annotated property/key name&lt;/td&gt;
+ &lt;td&gt;The optional property name mostly used within TYPE level annotations.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td&gt;type&lt;/td&gt;
+ &lt;td&gt;no&lt;/td&gt;
+ &lt;td&gt;ConversionType.CLASS&lt;/td&gt;
+ &lt;td&gt;Enum value of ConversionType.  Determines whether the conversion should be applied at application or class level.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td&gt;rule&lt;/td&gt;
+ &lt;td&gt;no&lt;/td&gt;
+ &lt;td&gt;ConversionRule.PROPERTY&lt;/td&gt;
+ &lt;td&gt;Enum value of ConversionRule. The ConversionRule can be a property, a Collection or a Map.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td&gt;converter&lt;/td&gt;
+ &lt;td&gt;DEPRECATED: either this or value&lt;/td&gt;
+ &lt;td&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td&gt;The class name of the TypeConverter to be used as converter.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td&gt;converterClass&lt;/td&gt;
+ &lt;td&gt;either this or value&lt;/td&gt;
+ &lt;td&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td&gt;The class of the TypeConverter to be used as converter. XWorkBasicConverter by default.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td&gt;value&lt;/td&gt;
+ &lt;td&gt;either converter or this&lt;/td&gt;
+ &lt;td&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td&gt;The value to set for ConversionRule.KEY_PROPERTY.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/tbody&gt;
+ &lt;/table&gt;
+
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.conversion.annotations.TypeConversion</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;Conversion()
+ public class ConversionAction implements Action {
+
+   private String convertInt;
+
+   private String convertDouble;
+   private List users = null;
+
+   private HashMap keyValues = null;
+
+   &amp;#64;TypeConversion(type = ConversionType.APPLICATION)
+   public void setConvertInt( String convertInt ) {
+       this.convertInt = convertInt;
+   }
+
+   &amp;#64;TypeConversion(converterClass = XWorkBasicConverter.class)
+   public void setConvertDouble( String convertDouble ) {
+       this.convertDouble = convertDouble;
+   }
+
+   &amp;#64;TypeConversion(rule = ConversionRule.COLLECTION, converterClass = String.class)
+   public void setUsers( List users ) {
+       this.users = users;
+   }
+
+   &amp;#64;TypeConversion(rule = ConversionRule.MAP, converterClass = BigInteger.class)
+   public void setKeyValues( HashMap keyValues ) {
+       this.keyValues = keyValues;
+   }
+
+   &amp;#64;TypeConversion(type = ConversionType.APPLICATION, property = "java.util.Date", converterClass = XWorkBasicConverter.class)
+   public String execute() throws Exception {
+       return SUCCESS;
+   }
+ }
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/using-field-validators.html b/content/core-developers/using-field-validators.html
index b6e655d..b97998d 100644
--- a/content/core-developers/using-field-validators.html
+++ b/content/core-developers/using-field-validators.html
@@ -137,24 +137,36 @@
 
 <p>Create the jsp page</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=fieldValidatorsExample|lang=xml|javadoc=false|url=struts2/apps/showcase/src/main/webapp/WEB-INF/validation/fieldValidatorsExample.jsp</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: fieldValidatorsExample not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/webapp/WEB-INF/validation/fieldValidatorsExample/jsp.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p><strong>Step 2</strong></p>
 
 <p>Create the action class</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=fieldValidatorsExample|javadoc=false|lang=java|url=struts2/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+START SNIPPET: fieldValidatorsExample not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p><strong>Step 3</strong></p>
 
 <p>Create the validator.xml.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=fieldValidatorsExample|javadoc=false|lang=xml|url=struts2/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: fieldValidatorsExample not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation/xml.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/using-non-field-validators.html b/content/core-developers/using-non-field-validators.html
index f00cec8..2b76b26 100644
--- a/content/core-developers/using-non-field-validators.html
+++ b/content/core-developers/using-non-field-validators.html
@@ -137,24 +137,36 @@
 
 <p>Create the jsp page</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=nonFieldValidatorsExample|lang=xml|javadoc=false|url=struts2/apps/showcase/src/main/webapp/WEB-INF/validation/nonFieldValidatorsExample.jsp</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: nonFieldValidatorsExample not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/webapp/WEB-INF/validation/nonFieldValidatorsExample/jsp.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p><strong>Step 2</strong></p>
 
 <p>Create the action class</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=nonFieldValidatorsExample|javadoc=false|lang=java|url=struts2/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+START SNIPPET: nonFieldValidatorsExample not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p><strong>Step 3</strong></p>
 
 <p>Create the validator.xml.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=nonFieldValidatorsExample|javadoc=false|lang=xml|url=struts2/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: nonFieldValidatorsExample not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation/xml.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/using-visitor-field-validator.html b/content/core-developers/using-visitor-field-validator.html
index c03ddc9..90aaf21 100644
--- a/content/core-developers/using-visitor-field-validator.html
+++ b/content/core-developers/using-visitor-field-validator.html
@@ -137,24 +137,36 @@
 
 <p>Create the jsp page.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=visitorValidatorsExample|lang=xml|javadoc=false|url=struts2/apps/showcase/src/main/webapp/WEB-INF/validation/visitorValidatorsExample.jsp</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: visitorValidatorsExample not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/webapp/WEB-INF/validation/visitorValidatorsExample/jsp.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p><strong>Step 2</strong></p>
 
 <p>Create the action class.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=visitorValidatorsExample|javadoc=false|lang=java|url=struts2/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+START SNIPPET: visitorValidatorsExample not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p><strong>Step 3</strong></p>
 
 <p>Create the validator.xml.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=visitorValidatorsExample|javadoc=false|lang=xml|url=struts2/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: visitorValidatorsExample not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation/xml.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/validation-annotation.html b/content/core-developers/validation-annotation.html
index ed2fd29..85bca3d 100644
--- a/content/core-developers/validation-annotation.html
+++ b/content/core-developers/validation-annotation.html
@@ -129,20 +129,34 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/validation-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="validation-annotation">Validation Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.Validation</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> This annotation has been deprecated since 2.1 as its previous purpose, to define classes that support annotation validations,
+ is no longer necessary.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.Validation</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The Validation annotation must be applied at Type level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.Validation</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;validations&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
@@ -158,14 +172,74 @@
   </li>
 </ul>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.Validation</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;Validation()
+ public interface AnnotationDataAware {
+
+     void setBarObj(Bar b);
+
+     Bar getBarObj();
+
+     &amp;#64;RequiredFieldValidator(message = "You must enter a value for data.")
+     &amp;#64;RequiredStringValidator(message = "You must enter a value for data.")
+     void setData(String data);
+
+     String getData();
+ }
+```
+
+</code></pre>
 </div>
 
 <p><strong>An Annotated Class</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.Validation</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;Validation()
+ public class SimpleAnnotationAction extends ActionSupport {
+
+     &amp;#64;RequiredFieldValidator(type = ValidatorType.FIELD, message = "You must enter a value for bar.")
+     &amp;#64;IntRangeFieldValidator(type = ValidatorType.FIELD, min = "6", max = "10", message = "bar must be between ${min} and ${max}, current value is ${bar}.")
+     public void setBar(int bar) {
+         this.bar = bar;
+     }
+
+     public int getBar() {
+         return bar;
+     }
+
+     &amp;#64;Validations(
+             requiredFields =
+                     {&amp;#64;RequiredFieldValidator(type = ValidatorType.SIMPLE, fieldName = "customfield", message = "You must enter a value for field.")},
+             requiredStrings =
+                     {&amp;#64;RequiredStringValidator(type = ValidatorType.SIMPLE, fieldName = "stringisrequired", message = "You must enter a value for string.")},
+             emails =
+                     { &amp;#64;EmailValidator(type = ValidatorType.SIMPLE, fieldName = "emailaddress", message = "You must enter a value for email.")},
+             urls =
+                     { &amp;#64;UrlValidator(type = ValidatorType.SIMPLE, fieldName = "hreflocation", message = "You must enter a value for email.")},
+             stringLengthFields =
+                     {&amp;#64;StringLengthFieldValidator(type = ValidatorType.SIMPLE, trim = true, minLength="10" , maxLength = "12", fieldName = "needstringlength", message = "You must enter a stringlength.")},
+             intRangeFields =
+                     { @IntRangeFieldValidator(type = ValidatorType.SIMPLE, fieldName = "intfield", min = "6", max = "10", message = "bar must be between ${min} and ${max}, current value is ${bar}.")},
+             dateRangeFields =
+                     {&amp;#64;DateRangeFieldValidator(type = ValidatorType.SIMPLE, fieldName = "datefield", min = "-1", max = "99", message = "bar must be between ${min} and ${max}, current value is ${bar}.")},
+             expressions = {
+                 &amp;#64;ExpressionValidator(expression = "foo &amp;gt; 1", message = "Foo must be greater than Bar 1. Foo = ${foo}, Bar = ${bar}."),
+                 &amp;#64;ExpressionValidator(expression = "foo &amp;gt; 2", message = "Foo must be greater than Bar 2. Foo = ${foo}, Bar = ${bar}."),
+                 &amp;#64;ExpressionValidator(expression = "foo &amp;gt; 3", message = "Foo must be greater than Bar 3. Foo = ${foo}, Bar = ${bar}."),
+                 &amp;#64;ExpressionValidator(expression = "foo &amp;gt; 4", message = "Foo must be greater than Bar 4. Foo = ${foo}, Bar = ${bar}."),
+                 &amp;#64;ExpressionValidator(expression = "foo &amp;gt; 5", message = "Foo must be greater than Bar 5. Foo = ${foo}, Bar = ${bar}.")
+     }
+     )
+     public String execute() throws Exception {
+         return SUCCESS;
+     }
+ }
+
+```
+
+</code></pre>
 </div>
 
 <blockquote>
diff --git a/content/core-developers/validation-interceptor.html b/content/core-developers/validation-interceptor.html
index cd55651..6277d17 100644
--- a/content/core-developers/validation-interceptor.html
+++ b/content/core-developers/validation-interceptor.html
@@ -129,26 +129,101 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/validation-interceptor.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="validation-interceptor">Validation Interceptor</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.ValidationInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;
+ This interceptor runs the action through the standard validation framework, which in turn checks the action against
+ any validation rules (found in files such as &lt;i&gt;ActionClass-validation.xml&lt;/i&gt;) and adds field-level and action-level
+ error messages (provided that the action implements {@link ValidationAware}). This interceptor
+ is often one of the last (or second to last) interceptors applied in a stack, as it assumes that all values have
+ already been set on the action.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ This interceptor does nothing if the name of the method being invoked is specified in the &lt;b&gt;excludeMethods&lt;/b&gt;
+ parameter. &lt;b&gt;excludeMethods&lt;/b&gt; accepts a comma-delimited list of method names. For example, requests to
+ &lt;b&gt;foo!input.action&lt;/b&gt; and &lt;b&gt;foo!back.action&lt;/b&gt; will be skipped by this interceptor if you set the
+ &lt;b&gt;excludeMethods&lt;/b&gt; parameter to "input, back".
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ The workflow of the action request does not change due to this interceptor. Rather,
+ this interceptor is often used in conjunction with the &lt;b&gt;workflow&lt;/b&gt; interceptor.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;NOTE:&lt;/b&gt; As this method extends off MethodFilterInterceptor, it is capable of
+ deciding if it is applicable only to selective methods in the action class. See
+ &lt;code&gt;MethodFilterInterceptor&lt;/code&gt; for more info.
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.ValidationInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;ul&gt;
+
+ &lt;li&gt;alwaysInvokeValidate - Defaults to true. If true validate() method will always
+ be invoked, otherwise it will not.&lt;/li&gt;
+
+ &lt;li&gt;programmatic - Defaults to true. If true and the action is Validateable call validate(),
+ and any method that starts with "validate".
+ &lt;/li&gt;
+ 
+ &lt;li&gt;declarative - Defaults to true. Perform validation based on xml or annotations.&lt;/li&gt;
+ 
+ &lt;/ul&gt;
+
+</code></pre>
 </div>
 
 <p>#####Extending the Interceptor#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=extending|javadoc=true|url=com.opensymphony.xwork2.validator.ValidationInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ There are no known extension points for this interceptor.
+
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=com.opensymphony.xwork2.validator.ValidationInterceptor</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ 
+ &amp;lt;action name=&amp;quot;someAction&amp;quot; class=&amp;quot;com.examples.SomeAction&amp;quot;&amp;gt;
+     &amp;lt;interceptor-ref name=&amp;quot;params&amp;quot;/&amp;gt;
+     &amp;lt;interceptor-ref name=&amp;quot;validation&amp;quot;/&amp;gt;
+     &amp;lt;interceptor-ref name=&amp;quot;workflow&amp;quot;/&amp;gt;
+     &amp;lt;result name=&amp;quot;success&amp;quot;&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+ 
+ &amp;lt;-- in the following case myMethod of the action class will not
+        get validated --&amp;gt;
+ &amp;lt;action name=&amp;quot;someAction&amp;quot; class=&amp;quot;com.examples.SomeAction&amp;quot;&amp;gt;
+     &amp;lt;interceptor-ref name=&amp;quot;params&amp;quot;/&amp;gt;
+     &amp;lt;interceptor-ref name=&amp;quot;validation&amp;quot;&amp;gt;
+         &amp;lt;param name=&amp;quot;excludeMethods&amp;quot;&amp;gt;myMethod&amp;lt;/param&amp;gt;
+     &amp;lt;/interceptor-ref&amp;gt;
+     &amp;lt;interceptor-ref name=&amp;quot;workflow&amp;quot;/&amp;gt;
+     &amp;lt;result name=&amp;quot;success&amp;quot;&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+ 
+ &amp;lt;-- in the following case only annotated methods of the action class will
+        be validated --&amp;gt;
+ &amp;lt;action name=&amp;quot;someAction&amp;quot; class=&amp;quot;com.examples.SomeAction&amp;quot;&amp;gt;
+     &amp;lt;interceptor-ref name=&amp;quot;params&amp;quot;/&amp;gt;
+     &amp;lt;interceptor-ref name=&amp;quot;validation&amp;quot;&amp;gt;
+         &amp;lt;param name=&amp;quot;validateAnnotatedMethodOnly&amp;quot;&amp;gt;true&amp;lt;/param&amp;gt;
+     &amp;lt;/interceptor-ref&amp;gt;
+     &amp;lt;interceptor-ref name=&amp;quot;workflow&amp;quot;/&amp;gt;
+     &amp;lt;result name=&amp;quot;success&amp;quot;&amp;gt;good_result.ftl&amp;lt;/result&amp;gt;
+ &amp;lt;/action&amp;gt;
+
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/validation-parameter-annotation.html b/content/core-developers/validation-parameter-annotation.html
index 0f36589..047d478 100644
--- a/content/core-developers/validation-parameter-annotation.html
+++ b/content/core-developers/validation-parameter-annotation.html
@@ -129,26 +129,53 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/validation-parameter-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="validationparameter-annotation">ValidationParameter annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ValidationParameter</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> The ValidationParameter annotation is used as a parameter for CustomValidators.
+</code></pre>
 </div>
 
 <p><strong>Usage</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ValidationParameter</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The annotation must embedded into CustomValidator annotations as a parameter.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.ValidationParameter</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;name&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;parameter name.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;value&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;parameter value.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.ValidationParameter</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;CustomValidator(
+   type ="customValidatorName",
+   fieldName = "myField",
+   parameters = { &amp;#64;ValidationParameter( name = "paramName", value = "paramValue" ) }
+ )
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/validations-annotation.html b/content/core-developers/validations-annotation.html
index 9cd2aa2..9da3002 100644
--- a/content/core-developers/validations-annotation.html
+++ b/content/core-developers/validations-annotation.html
@@ -129,26 +129,133 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/validations-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="validations-annotation">Validations Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.Validations</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;If you want to use several annotations of the same type, these annotations must be nested within the @Validations() annotation.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.Validations</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Used at METHOD level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.Validations</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; requiredFields &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+
+ &lt;td class='confluenceTd'&gt; Add list of RequiredFieldValidators  &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; customValidators &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Add list of CustomValidators &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; conversionErrorFields &lt;/td&gt;
+
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Add list of ConversionErrorFieldValidators &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; dateRangeFields &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Add list of DateRangeFieldValidators &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; emails &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Add list of EmailValidators &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; fieldExpressions &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Add list of FieldExpressionValidators &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; intRangeFields &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Add list of IntRangeFieldValidators &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; requiredStrings &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Add list of RequiredStringValidators &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; stringLengthFields &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Add list of StringLengthFieldValidators &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; urls &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Add list of UrlValidators &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; visitorFields &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Add list of VisitorFieldValidators &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; regexFields &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Add list of RegexFieldValidator &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; expressions &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Add list of ExpressionValidator &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.Validations</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;Validations(
+           requiredFields =
+                   {&amp;#64;RequiredFieldValidator(type = ValidatorType.SIMPLE, fieldName = "customfield", message = "You must enter a value for field.")},
+           requiredStrings =
+                   {&amp;#64;RequiredStringValidator(type = ValidatorType.SIMPLE, fieldName = "stringisrequired", message = "You must enter a value for string.")},
+           emails =
+                   { &amp;#64;EmailValidator(type = ValidatorType.SIMPLE, fieldName = "emailaddress", message = "You must enter a value for email.")},
+           urls =
+                   { &amp;#64;UrlValidator(type = ValidatorType.SIMPLE, fieldName = "hreflocation", message = "You must enter a value for email.")},
+           stringLengthFields =
+                   {&amp;#64;StringLengthFieldValidator(type = ValidatorType.SIMPLE, trim = true, minLength="10" , maxLength = "12", fieldName = "needstringlength", message = "You must enter a stringlength.")},
+           intRangeFields =
+                   { &amp;#64;IntRangeFieldValidator(type = ValidatorType.SIMPLE, fieldName = "intfield", min = "6", max = "10", message = "bar must be between ${min} and ${max}, current value is ${bar}.")},
+           longRangeFields =
+                   { &amp;#64;LongRangeFieldValidator(type = ValidatorType.SIMPLE, fieldName = "intfield", min = "6", max = "10", message = "bar must be between ${min} and ${max}, current value is ${bar}.")},
+           shortRangeFields =
+                   { &amp;#64;ShortRangeFieldValidator(type = ValidatorType.SIMPLE, fieldName = "shortfield", min = "1", max = "128", message = "bar must be between ${min} and ${max}, current value is ${bar}.")},
+           dateRangeFields =
+                   {&amp;#64;DateRangeFieldValidator(type = ValidatorType.SIMPLE, fieldName = "datefield", min = "-1", max = "99", message = "bar must be between ${min} and ${max}, current value is ${bar}.")},
+           expressions = {
+               &amp;#64;ExpressionValidator(expression = "foo &amp;gt; 1", message = "Foo must be greater than Bar 1. Foo = ${foo}, Bar = ${bar}."),
+               &amp;#64;ExpressionValidator(expression = "foo &amp;gt; 2", message = "Foo must be greater than Bar 2. Foo = ${foo}, Bar = ${bar}."),
+               &amp;#64;ExpressionValidator(expression = "foo &amp;gt; 3", message = "Foo must be greater than Bar 3. Foo = ${foo}, Bar = ${bar}."),
+               &amp;#64;ExpressionValidator(expression = "foo &amp;gt; 4", message = "Foo must be greater than Bar 4. Foo = ${foo}, Bar = ${bar}."),
+               &amp;#64;ExpressionValidator(expression = "foo &amp;gt; 5", message = "Foo must be greater than Bar 5. Foo = ${foo}, Bar = ${bar}.")
+   }
+   )
+   public String execute() throws Exception {
+       return SUCCESS;
+   }
+```
+
+</code></pre>
 </div>
 
 <p>#####Different validations per method#####</p>
diff --git a/content/core-developers/velocity-result.html b/content/core-developers/velocity-result.html
index e325c46..087be46 100644
--- a/content/core-developers/velocity-result.html
+++ b/content/core-developers/velocity-result.html
@@ -129,20 +129,24 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/velocity-result.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="velocity-result">Velocity Result</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.dispatcher.VelocityResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: description not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java;hb=HEAD
+</code></pre>
 </div>
 
 <p>####Parameters####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=params|javadoc=true|url=org.apache.struts2.dispatcher.VelocityResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: params not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java;hb=HEAD
+</code></pre>
 </div>
 
 <p>####Examples####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.dispatcher.VelocityResult</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/core-developers/visitor-field-validator-annotation.html b/content/core-developers/visitor-field-validator-annotation.html
index 37109eb..85ddf12 100644
--- a/content/core-developers/visitor-field-validator-annotation.html
+++ b/content/core-developers/visitor-field-validator-annotation.html
@@ -129,26 +129,86 @@
     <a class="edit-on-gh" href="https://github.com/apache/struts-site/edit/master/source/core-developers/visitor-field-validator-annotation.md" title="Edit this page on GitHub">Edit on GitHub</a>
     <h1 id="visitorfieldvalidator-annotation">VisitorFieldValidator Annotation</h1>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.VisitorFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> The validator allows you to forward validator to object properties of your action
+ using the objects own validator files. This allows you to use the ModelDriven development
+ pattern and manage your validations for your models in one place, where they belong, next to
+ your model classes.
+
+ The VisitorFieldValidator can handle either simple Object properties, Collections of Objects, or Arrays.
+ The error message for the VisitorFieldValidator will be appended in front of validator messages added
+ by the validations for the Object message.
+</code></pre>
 </div>
 
 <p>#####Usage#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=usage|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.VisitorFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The annotation must be applied at method level.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>#####Parameters#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=parameters|javadoc=true|url=com.opensymphony.xwork2.validator.annotations.VisitorFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;table class='confluenceTable' summary=''&gt;
+ &lt;tr&gt;
+ &lt;th class='confluenceTh'&gt; Parameter &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Required &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Default &lt;/th&gt;
+ &lt;th class='confluenceTh'&gt; Notes &lt;/th&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;message&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;yes&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;field error message&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;key&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;i18n key from language specific properties file.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;messageParams&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;Additional params to be used to customize message - will be evaluated against the Value Stack&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;fieldName&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;&amp;nbsp;&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt;shortCircuit&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;no&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;false&lt;/td&gt;
+ &lt;td class='confluenceTd'&gt;If this validator should be used as shortCircuit.&lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; context &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; action alias &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Determines the context to use for validating the Object property. If not defined, the context of the Action validation is propogated to the Object property validation.  In the case of Action validation, this context is the Action alias.  &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+ &lt;td class='confluenceTd'&gt; appendPrefix &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; no &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; true &lt;/td&gt;
+ &lt;td class='confluenceTd'&gt; Determines whether the field name of this field validator should be prepended to the field name of the visited field to determine the full field name when an error occurs.  For example, suppose that the bean being validated has a "name" property.  If &lt;em&gt;appendPrefix&lt;/em&gt; is true, then the field error will be stored under the field "bean.name".  If &lt;em&gt;appendPrefix&lt;/em&gt; is false, then the field error will be stored under the field  [...]
+ &lt;/tr&gt;
+ &lt;/table&gt;
+</code></pre>
 </div>
 
 <p>#####Examples#####</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=java|url=com.opensymphony.xwork2.validator.annotations.VisitorFieldValidator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;#64;VisitorFieldValidator(message = "Default message", key = "i18n.key", shortCircuit = true, context = "action alias", appendPrefix = true)
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/action-tag.html b/content/tag-developers/action-tag.html
index 9f84f1e..dd40100 100644
--- a/content/tag-developers/action-tag.html
+++ b/content/tag-developers/action-tag.html
@@ -133,8 +133,10 @@
 
 <h2 id="description">Description</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.ActionComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;This tag enables developers to call actions directly from a JSP page by specifying the action name and an optional
+ namespace.  The body content of the tag is used to render the results from the Action.  Any result processor defined
+ for this action in struts.xml will be ignored, &lt;i&gt;unless&lt;/i&gt; the executeResult parameter is specified.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p>Parameters can be passed to the action using nested <a href="param-tag.html">param</a> tags.</p>
@@ -235,16 +237,58 @@ the action cannot be accessed, For example:</p>
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javacode|javadoc=true|lang=java|url=org.apache.struts2.components.ActionComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ public class ActionTagAction extends ActionSupport {
+
+  public String execute() throws Exception {
+      return "done";
+  }
+
+  public String doDefault() throws Exception {
+      ServletActionContext.getRequest().setAttribute("stringByAction", "This is a String put in by the action's doDefault()");
+      return "done";
+  }
+ }
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=strutsxml|javadoc=true|lang=xml|url=org.apache.struts2.components.ActionComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+   &amp;lt;xwork&amp;gt;
+      ....
+     &amp;lt;action name=&amp;quot;actionTagAction1&amp;quot; class=&amp;quot;tmjee.testing.ActionTagAction&amp;quot;&amp;gt;
+         &amp;lt;result name=&amp;quot;done&amp;quot;&amp;gt;success.jsp&amp;lt;/result&amp;gt;
+     &amp;lt;/action&amp;gt;
+      &amp;lt;action name=&amp;quot;actionTagAction2&amp;quot; class=&amp;quot;tmjee.testing.ActionTagAction&amp;quot; method=&amp;quot;default&amp;quot;&amp;gt;
+         &amp;lt;result name=&amp;quot;done&amp;quot;&amp;gt;success.jsp&amp;lt;/result&amp;gt;
+     &amp;lt;/action&amp;gt;
+      ....
+   &amp;lt;/xwork&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=xml|url=org.apache.struts2.components.ActionComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+  &lt;span&gt;The following action tag will execute result and include it in this page&lt;/span&gt;
+  &lt;br&gt;
+  &amp;lt;s:action name=&amp;quot;actionTagAction&amp;quot; executeResult=&amp;quot;true&amp;quot; /&amp;gt;
+  &lt;br&gt;
+  &lt;span&gt;The following action tag will do the same as above, but invokes method specialMethod in action&lt;/span&gt;
+  &lt;br&gt;
+  &amp;lt;s:action name=&amp;quot;actionTagAction!specialMethod&amp;quot; executeResult=&amp;quot;true&amp;quot; /&amp;gt;
+  &lt;br&gt;
+  &lt;span&gt;The following action tag will not execute result, but put a String in request scope
+       under an id "stringByAction" which will be retrieved using property tag&lt;/span&gt;
+  &amp;lt;s:action name=&amp;quot;actionTagAction!default&amp;quot; executeResult=&amp;quot;false&amp;quot; /&amp;gt;
+  &amp;lt;s:property value=&amp;quot;#attr.stringByAction&amp;quot; /&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/actionerror-tag.html b/content/tag-developers/actionerror-tag.html
index 06e788c..16d87d3 100644
--- a/content/tag-developers/actionerror-tag.html
+++ b/content/tag-developers/actionerror-tag.html
@@ -131,20 +131,33 @@
 
 <h2 id="description">Description</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.ActionError</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Render action errors if they exists the specific layout of the rendering depends on
+ the theme itself. Empty (null or blank string) errors will not be printed. The action error
+ strings will be html escaped by default.
+
+</code></pre>
 </div>
 
 <h2 id="parameters">Parameters</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/actionerror.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/actionerror/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.ActionError</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+    &amp;lt;s:actionerror /&amp;gt;
+    &amp;lt;s:form .... &amp;gt;
+       ....
+    &amp;lt;/s:form&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/actionmessage-tag.html b/content/tag-developers/actionmessage-tag.html
index 18877ab..ae702e9 100644
--- a/content/tag-developers/actionmessage-tag.html
+++ b/content/tag-developers/actionmessage-tag.html
@@ -131,20 +131,31 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.ActionMessage</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Render action messages if they exists, specific rendering layout depends on the
+ theme itself. Empty (null or blank string) messages will not be printed. The action message
+ strings will be html escaped by default.
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/actionmessage.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/actionmessage/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.ActionMessage</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+    &amp;lt;s:actionmessage /&amp;gt;
+    &amp;lt;s:form .... &amp;gt;
+       ....
+    &amp;lt;/s:form&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/ajax-common-header.html b/content/tag-developers/ajax-common-header.html
index 59fc9eb..0d9d530 100644
--- a/content/tag-developers/ajax-common-header.html
+++ b/content/tag-developers/ajax-common-header.html
@@ -143,70 +143,106 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/autocompleter.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/autocompleter/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>Get list from an action:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Uses a list:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Autocompleter that reloads its content everytime the text changes (and the length of the text is greater than 3):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Linking two autocompleters:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example4|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example4 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Set/Get selected values using JavaScript:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example5|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example5 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using beforeNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example6|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example6 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using errorNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example7|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example7 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using errorNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example8|lang=html|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```html
+START SNIPPET: example8 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using valueNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example9|lang=html|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```html
+START SNIPPET: example9 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p><strong>Caveats</strong></p>
@@ -228,8 +264,8 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p>There’s a bug in  IE6/IE7 which makes impossible to use the target’s attribute with a parent Div, because such Div’s content’s are overwritten with the tag’s <em>loadingText</em> . Resulting in an “undefined” message in the content’s, instead of the result of the request.</p>
@@ -250,46 +286,70 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/bind.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/bind/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>Without attaching to an event, listening to a topic (used to make an Ajax call):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example0|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example0 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Attached to event ‘onclick’ on submit button:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Submit form:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using beforeNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example4|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example4 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using afterNotifyTopics and highlight:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example5|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example5 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using errorNotifyTopics and indicator:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example6|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example6 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>#####checkbox##### {#PAGE_14029}</p>
@@ -305,20 +365,32 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Checkbox</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Renders an HTML input element of type checkbox, populated by the specified property from the ValueStack.
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/checkbox.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/checkbox/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Checkbox</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ JSP:
+ &amp;lt;s:checkbox label="checkbox test" name="checkboxField1" value="aBoolean" fieldValue="true"/&amp;gt;
+
+ Velocity:
+ #tag( Checkbox "label=checkbox test" "name=checkboxField1" "value=aBoolean" )
+
+ Resulting HTML (simple template, aBoolean == true):
+ &amp;lt;input type="checkbox" name="checkboxField1" value="true" checked="checked" /&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
 <p>#####checkboxlist##### {#PAGE_13969}</p>
@@ -332,32 +404,34 @@
   </tbody>
 </table>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=javadoc</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.ListUIBean}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ Note that the listkey and listvalue attribute will default to "key" and "value"
+ respectively only when the list attribute is evaluated to a Map or its descendant.
+ Everything else will result in listkey and listvalue to be null and not used.
+ </p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.CheckboxList</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Creates a series of checkboxes from a list. Setup is like &amp;lt;s:select /&amp;gt; or &amp;lt;s:radio /&amp;gt;, but creates checkbox tags.
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/checkboxlist.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/checkboxlist/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.CheckboxList</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:checkboxlist name="foo" list="bar"/&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p>#####combobox##### {#PAGE_14259}</p>
@@ -373,39 +447,118 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.ComboBox</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ The combo box is basically an HTML INPUT of type text and HTML SELECT grouped together to give you a combo box
+ functionality. You can place text in the INPUT control by using the SELECT control or type it in directly in
+ the text field.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ In this example, the SELECT will be populated from id=year attribute. Counter is itself an Iterator. It will
+ span from first to last. The population is done via javascript, and requires that this tag be surrounded by a
+ &amp;lt;form&amp;gt;.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ Note that unlike the &amp;lt;s:select/&amp;gt; tag, there is no ability to define the individual &amp;lt;option&amp;gt; tags' id attribute
+ or content separately. Each of these is simply populated from the toString() method of the list item. Presumably
+ this is because the select box isn't intended to actually submit useful data, but to assist the user in filling
+ out the text field.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/combobox.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/combobox/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.ComboBox</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ JSP:
+ &amp;lt;-- Example One --&amp;gt;
+ &amp;lt;s:bean name="struts.util.Counter" var="year"&amp;gt;
+   &amp;lt;s:param name="first" value="text('firstBirthYear')"/&amp;gt;
+   &amp;lt;s:param name="last" value="2000"/&amp;gt;
+
+   &amp;lt;s:combobox label="Birth year" size="6" maxlength="4" name="birthYear" list="#year"/&amp;gt;
+ &amp;lt;/s:bean&amp;gt;
+
+ &amp;lt;-- Example Two --&amp;gt;
+ &amp;lt;s:combobox
+     label="My Favourite Fruit"
+     name="myFavouriteFruit"
+     list="{'apple','banana','grape','pear'}"
+     headerKey="-1"
+     headerValue="--- Please Select ---"
+     emptyOption="true"
+     value="banana" /&amp;gt;
+
+ &amp;lt;-- Example Two --&amp;gt;
+ &amp;lt;s:combobox
+    label="My Favourite Color"
+    name="myFavouriteColor"
+    list="#{'red':'red','green':'green','blue':'blue'}"
+    headerKey="-1"
+    headerValue="--- Please Select ---"
+    emptyOption="true"
+    value="green" /&amp;gt;
+
+ Velocity:
+ #tag( ComboBox "label=Birth year" "size=6" "maxlength=4" "name=birthYear" "list=#year" )
+```
+
+</code></pre>
 </div>
 
 <p>#####component##### {#PAGE_14033}</p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.GenericUIBean</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Renders an custom UI widget using the specified templates. Additional objects can be passed in to the template
+ using the param tags.
+ &lt;/p&gt;
+
+ &lt;p&gt;&lt;b&gt;Freemarker:&lt;/b&gt;&lt;/p&gt;
+ &lt;pre&gt;Objects provided can be retrieve from within the template via $parameters._paramname_.&lt;/pre&gt;
+
+ &lt;p&gt;&lt;b&gt;JSP:&lt;/b&gt;&lt;/p&gt;
+ &lt;pre&gt;Objects provided can be retrieve from within the template via &amp;lt;s:property value="%{parameters._paramname_}" /&amp;gt;&lt;/pre&gt;
+
+ &lt;p&gt;
+ In the bottom JSP and Velocity samples, two parameters are being passed in to the component. From within the
+ component, they can be accessed as:
+ &lt;/p&gt;
+
+ &lt;p&gt;&lt;b&gt;Freemarker:&lt;/b&gt;&lt;/p&gt;
+ &lt;pre&gt;$parameters.get('key1') and $parameters.get('key2') or $parameters.key1 and $parameters.key2&lt;/pre&gt;
+
+ &lt;p&gt;&lt;b&gt;JSP:&lt;/b&gt;&lt;/p&gt;
+ &lt;pre&gt;
+ &amp;lt;s:property value="%{parameters.key1}" /&amp;gt; and &amp;lt;s:property value="%{'parameters.key2'}" /&amp;gt; or
+ &amp;lt;s:property value="%{parameters.get('key1')}" /&amp;gt; and &amp;lt;s:property value="%{parameters.get('key2')}" /&amp;gt;
+ &lt;/pre&gt;
+
+ &lt;p&gt;
+ Currently, your custom UI components can be written in Velocity, JSP, or Freemarker, and the correct rendering
+ engine will be found based on file extension.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;Remember:&lt;/b&gt; the value params will always be resolved against the ValueStack so if you mean to pass a
+ string literal to your component, make sure to wrap it in single quotes i.e. value="'value1'" (note the opening "' and closing '" otherwise, the the value
+ stack will search for an Object on the stack with a method of getValue1().
+ &lt;/p&gt;
+</code></pre>
 </div>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=note</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.GenericUIBean}</td>
-    </tr>
-  </tbody>
-</table>
+<p>If Jsp is used as the template, the jsp template itself must lie within the
+ webapp itself and not the classpath. Unlike Freemarker or Velocity, JSP template
+ could not be picked up from the classpath.</p>
 
 <p><strong>(!) templateDir and theme attribute</strong></p>
 
@@ -439,14 +592,58 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/component.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/component/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.GenericUIBean</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &lt;p&gt;
+ JSP
+ &lt;/p&gt;
+ &lt;pre&gt;
+     &amp;lt;s:component template="/my/custom/component.vm"/&amp;gt;
+
+       or
+
+     &amp;lt;s:component template="/my/custom/component.vm"&amp;gt;
+       &amp;lt;s:param name="key1" value="value1"/&amp;gt;
+       &amp;lt;s:param name="key2" value="value2"/&amp;gt;
+     &amp;lt;/s:component&amp;gt;
+ &lt;/pre&gt;
+
+ &lt;p&gt;
+ Velocity
+ &lt;/p&gt;
+ &lt;pre&gt;
+     #s-component( "template=/my/custom/component.vm" )
+
+       or
+
+     #s-component( "template=/my/custom/component.vm" )
+       #s-param( "name=key1" "value=value1" )
+       #s-param( "name=key2" "value=value2" )
+     #end
+ &lt;/pre&gt;
+
+ &lt;p&gt;
+ Freemarker
+ &lt;/p&gt;
+ &lt;pre&gt;
+    &amp;lt;@s..component template="/my/custom/component.ftl" /&amp;gt;
+
+      or
+
+    &amp;lt;@s..component template="/my/custom/component.ftl"&amp;gt;
+       &amp;lt;@s..param name="key1" value="%{'value1'}" /&amp;gt;
+       &amp;lt;@s..param name="key2" value="%{'value2'}" /&amp;gt;
+    &amp;lt;/@s..component&amp;gt;
+ &lt;/pre&gt;
+```
+
+</code></pre>
 </div>
 
 <p>#####datetextfield##### {#PAGE_40506485}</p>
@@ -462,60 +659,76 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.DateTextField</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/components/DateTextField.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/datetextfield.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/datetextfield/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.DateTextField</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/components/DateTextField.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>#####datetimepicker##### {#PAGE_14274}</p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/datetimepicker.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/datetimepicker/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Getting and getting the datetimepicker value, from JavaScript:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Publish topic when value changes</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>#####div##### {#PAGE_13908}</p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Div</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/components/Div.java;hb=HEAD
+</code></pre>
 </div>
 
 <table>
@@ -535,60 +748,64 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/div.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/div/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p>#####dojo div##### {#PAGE_66929}</p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/div.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/div/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>Simple div that loads its content once:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>div that reloads its content every 2 seconds, and shows an indicator while reloading:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>div that uses topics to control the timer, highlights its content in red after reload, and submits a form:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>#####dojo head##### {#PAGE_66757}</p>
 
 <p><strong>Description</strong></p>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=notice</td>
-      <td>javadoc=true</td>
-      <td>url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java}</td>
-    </tr>
-  </tbody>
-</table>
+<p>START SNIPPET: notice not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head/java.java;hb=HEAD</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <blockquote>
@@ -609,32 +826,40 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/head.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/head/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>#####dojo textarea##### {#PAGE_66931}</p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TextArea.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TextArea/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/textarea.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/textarea/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p>#####doubleselect##### {#PAGE_14005}</p>
@@ -648,56 +873,93 @@
   </tbody>
 </table>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=javadoc</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.DoubleListUIBean}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ Note that the doublelistkey and doublelistvalue attribute will default to "key" and "value"
+ respectively only when the doublelist attribute is evaluated to a Map or its descendant.
+ Other thing else, will result in doublelistkey and doublelistvalue to be null and not used.
+ </p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.DoubleSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Renders two HTML select elements with second one changing displayed values depending on selected entry of first one.
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/doubleselect.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/doubleselect/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.DoubleSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:doubleselect label="doubleselect test1" name="menu" list="{'fruit','other'}" doubleName="dishes" doubleList="top == 'fruit' ? {'apple', 'orange'} : {'monkey', 'chicken'}" /&amp;gt;
+ &amp;lt;s:doubleselect label="doubleselect test2" name="menu" list="#{'fruit':'Nice Fruits', 'other':'Other Dishes'}" doubleName="dishes" doubleList="top == 'fruit' ? {'apple', 'orange'} : {'monkey', 'chicken'}" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p>#####fielderror##### {#PAGE_14151}</p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.FieldError</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Render field errors if they exists. Specific layout depends on the particular theme.
+ The field error strings will be html escaped by default.
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/fielderror.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/fielderror/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.FieldError</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+    &amp;lt;!-- example 1 --&amp;gt;
+    &amp;lt;s:fielderror /&amp;gt;
+
+    &amp;lt;!-- example 2 --&amp;gt;
+    &amp;lt;s:fielderror&amp;gt;
+         &amp;lt;s:param&amp;gt;field1&amp;lt;/s:param&amp;gt;
+         &amp;lt;s:param&amp;gt;field2&amp;lt;/s:param&amp;gt;
+    &amp;lt;/s:fielderror&amp;gt;
+    &amp;lt;s:form .... &amp;gt;
+       ....
+    &amp;lt;/s:form&amp;gt;
+
+    OR
+
+    &amp;lt;s:fielderror&amp;gt;
+          &amp;lt;s:param value="%{'field1'}" /&amp;gt;
+          &amp;lt;s:param value="%{'field2'}" /&amp;gt;
+    &amp;lt;/s:fielderror&amp;gt;
+    &amp;lt;s:form .... &amp;gt;
+       ....
+    &amp;lt;/s:form&amp;gt;
+
+    OR
+
+    &amp;lt;s:fielderror fieldName="field1" /&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.components.FieldError</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Example 1: display all field errors&lt;br&gt;
+ Example 2: display field errors only for 'field1' and 'field2'&lt;br&gt;
+
+</code></pre>
 </div>
 
 <p>#####file##### {#PAGE_14283}</p>
@@ -713,20 +975,25 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.File</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Renders an HTML file input element.
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/file.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/file/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.File</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:file name="anUploadFile" accept="text/*" /&amp;gt;
+ &amp;lt;s:file name="anohterUploadFIle" accept="text/html,text/plain" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p>#####form##### {#PAGE_14201}</p>
@@ -742,20 +1009,54 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Form</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Renders HTML an input form.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ The remote form allows the form to be submitted without the page being refreshed. The results from the form
+ can be inserted into any HTML element on the page.
+ &lt;/p&gt;
+ &lt;p&gt;
+ NOTE:&lt;br&gt;
+ The order / logic in determining the posting url of the generated HTML form is as follows:
+ &lt;/p&gt;
+
+ &lt;ol&gt;
+ &lt;li&gt;
+ If the action attribute is not specified, then the current request will be used to
+ determine the posting url
+ &lt;/li&gt;
+ &lt;li&gt;
+ If the action is given, Struts will try to obtain an ActionConfig. This will be
+ successful if the action attribute is a valid action alias defined struts.xml.
+ &lt;/li&gt;
+ &lt;li&gt;
+ If the action is given and is not an action alias defined in struts.xml, Struts
+ will used the action attribute as if it is the posting url, separting the namespace
+ from it and using UrlHelper to generate the final url.
+ &lt;/li&gt;
+ &lt;/ol&gt;
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/form.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/form/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Form</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;s:form ... /&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
 <p><strong>Validation</strong></p>
@@ -775,20 +1076,28 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Head</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Renders parts of the HEAD section for an HTML file. Encoding can be set using this tag.
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/head.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/head/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=org.apache.struts2.components.Head</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;head&amp;gt;
+   &amp;lt;title&amp;gt;My page&amp;lt;/title&amp;gt;
+   &amp;lt;s:head/&amp;gt;
+ &amp;lt;/head&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p>#####hidden##### {#PAGE_14313}</p>
@@ -804,50 +1113,75 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Hidden</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Renders an HTML input element of type hidden, populated by the specified property from the ValueStack.
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/hidden.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/hidden/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Hidden</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;-- example one --&amp;gt;
+ &amp;lt;s:hidden name="foo" /&amp;gt;
+ &amp;lt;-- example two --&amp;gt;
+ &amp;lt;s:hidden name="foo" value="%{bar}" /&amp;gt;
+
+ Example One Resulting HTML (if foo evaluates to bar):
+ &amp;lt;input type="hidden" name="foo" value="bar" /&amp;gt;
+ Example Two Resulting HTML (if getBar method of the action returns 'bar')
+ &amp;lt;input type="hidden" name="foo" value="bar" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p>#####inputtransferselect##### {#PAGE_17268774}</p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.InputTransferSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Create a input transfer select component which is basically an text input
+ and  &amp;lt;select ...&amp;gt; tag with buttons in the middle of them allowing text
+ to be added to the transfer select. Will auto-select all its
+ elements upon its containing form submission.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=notice</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.InputTransferSelect}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ NOTE: The id and doubleId need not be supplied as they will generated provided
+ that the inputtransferselect tag is being used in a form tag. The generated id
+ and doubleId will be &lt;form_id&gt;_&lt;inputtransferselect_doubleName&gt; and
+ &lt;form_id&gt;_&lt;inputtransferselect_doubleName&gt; respectively.
+ </p>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/inputtransferselect.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/inputtransferselect/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Example</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.InputTransferSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;-- minimum configuration --&amp;gt;
+ &amp;lt;s:inputtransferselect
+      label="Favourite Cartoons Characters"
+      name="cartoons"
+      list="{'Popeye', 'He-Man', 'Spiderman'}"
+  /&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
 <p>#####label##### {#PAGE_14167}</p>
@@ -863,24 +1197,35 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Label</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Renders an HTML LABEL that will allow you to output label:name combination that has the same format treatment as
+ the rest of your UI controls.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/label.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/label/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Label</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:label key="userName" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exdescription|lang=none|javadoc=true|url=org.apache.struts2.components.Label</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+ &lt;p&gt;In this example, a label is rendered. The label is retrieved from a ResourceBundle via the key attribute
+ giving you an output of 'User Name: Ford.Prefect'. Assuming that i18n message userName corresponds
+ to 'User Name' and the action's getUserName() method returns 'Ford.Prefect'&lt;/p&gt;
+```
+
+</code></pre>
 </div>
 
 <p>#####optgroup##### {#PAGE_14170}</p>
@@ -896,30 +1241,40 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.OptGroup</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Create a optgroup component which needs to resides within a select tag.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=notice</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.OptGroup}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ This component is to be used within a  Select component.
+ </p>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/optgroup.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/optgroup/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.OptGroup</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;s:select label="My Selection"
+            name="mySelection"
+            value="%{'POPEYE'}"
+            list="%{#{'SUPERMAN':'Superman', 'SPIDERMAN':'spiderman'}}"&amp;gt;
+    &amp;lt;s:optgroup label="Adult"
+                 list="%{#{'SOUTH_PARK':'South Park'}}" /&amp;gt;
+    &amp;lt;s:optgroup label="Japanese"
+                 list="%{#{'POKEMON':'pokemon','DIGIMON':'digimon','SAILORMOON':'Sailormoon'}}" /&amp;gt;
+ &amp;lt;/s:select&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
 <p>#####optiontransferselect##### {#PAGE_13943}</p>
@@ -933,36 +1288,75 @@
   </tbody>
 </table>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=javadoc</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.DoubleListUIBean}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ Note that the doublelistkey and doublelistvalue attribute will default to "key" and "value"
+ respectively only when the doublelist attribute is evaluated to a Map or its descendant.
+ Other thing else, will result in doublelistkey and doublelistvalue to be null and not used.
+ </p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.OptionTransferSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Create a option transfer select component which is basically two &amp;lt;select ...&amp;gt;
+ tag with buttons in the middle of them allowing options in each of the
+ &amp;lt;select ...&amp;gt; to be moved between themselves. Will auto-select all its
+ elements upon its containing form submision.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=notice|javadoc=true|url=org.apache.struts2.components.OptionTransferSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ NOTE: The id and doubleId need not be supplied as they will generated provided
+ that the optiontransferselect tag is being used in a form tag. The generated id
+ and doubleId will be &amp;lt;form_id&amp;gt;_&amp;lt;optiontransferselect_nameame&amp;gt; and
+ &amp;lt;form_id&amp;gt;_&amp;lt;optiontransferselect_doubleName&amp;gt; respectively.
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/optiontransferselect.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/optiontransferselect/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.OptionTransferSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;-- minimum configuration --&amp;gt;
+ &amp;lt;s:optiontransferselect
+      label="Favourite Cartoons Characters"
+      name="leftSideCartoonCharacters"
+      list="{'Popeye', 'He-Man', 'Spiderman'}"
+      doubleName="rightSideCartoonCharacters"
+      doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}"
+  /&amp;gt;
+
+  &amp;lt;-- possible configuration --&amp;gt;
+  &amp;lt;s:optiontransferselect
+      label="Favourite Cartoons Characters"
+      name="leftSideCartoonCharacters"
+      leftTitle="Left Title"
+      rightTitle="Right Title"
+      list="{'Popeye', 'He-Man', 'Spiderman'}"
+      multiple="true"
+      headerKey="headerKey"
+      headerValue="--- Please Select ---"
+      emptyOption="true"
+      doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}"
+      doubleName="rightSideCartoonCharacters"
+      doubleHeaderKey="doubleHeaderKey"
+      doubleHeaderValue="--- Please Select ---"
+      doubleEmptyOption="true"
+      doubleMultiple="true"
+  /&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
 <p>#####password##### {#PAGE_13826}</p>
@@ -978,24 +1372,35 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Password</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Render an HTML input tag of type password.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/password.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/password/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exdescription|javadoc=true|lang=none|url=org.apache.struts2.components.Password</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+ &lt;p&gt;
+ In this example, a password control is displayed. For the label, we are calling ActionSupport's getText() to
+ retrieve password label from a resource bundle.
+ &lt;/p&gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=xml|url=org.apache.struts2.components.Password</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:password label="%{text('password')}" name="password" size="10" maxlength="15" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p>#####radio##### {#PAGE_14226}</p>
@@ -1009,40 +1414,49 @@
   </tbody>
 </table>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=javadoc</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.ListUIBean}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ Note that the listkey and listvalue attribute will default to "key" and "value"
+ respectively only when the list attribute is evaluated to a Map or its descendant.
+ Everything else will result in listkey and listvalue to be null and not used.
+ </p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Radio</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Render a radio button input field.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/radio.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/radio/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exdescription|javadoc=true|url=org.apache.struts2.components.Radio</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> In this example, a radio control is displayed with a list of genders. The gender list is built from attribute
+ id=genders. The framework calls getGenders() which will return a Map. For examples using listKey and listValue attributes,
+ see the section select tag. The default selected one will be determined (in this case) by the getMale() method
+ in the action class which should return a value similar to the key of the getGenders() map if that particular
+ gender is to be selected.
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=xml|url=org.apache.struts2.components.Radio</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:action name="GenderMap" var="genders"/&amp;gt;
+ &amp;lt;s:radio label="Gender" name="male" list="#genders.genders"/&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example_fmt|javadoc=true|lang=xml|url=org.apache.struts2.components.Radio</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;@s.radio name="car" list={"ford": "Ford Motor Co", "toyota": "Toyota"} listKey="key" listValue="value" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p>#####reset##### {#PAGE_13833}</p>
@@ -1058,28 +1472,44 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Reset</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Render a reset button. The reset tag is used together with the form tag to provide form resetting.
+ The reset can have two different types of rendering:
+ &lt;ul&gt;
+ &lt;li&gt;input: renders as html &amp;lt;input type="reset"...&amp;gt;&lt;/li&gt;
+ &lt;li&gt;button: renders as html &amp;lt;button type="reset"...&amp;gt;&lt;/li&gt;
+ &lt;/ul&gt;
+ Please note that the button type has advantages by adding the possibility to separate the submitted value from the
+ text shown on the button face, but has issues with Microsoft Internet Explorer at least up to 6.0
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/reset.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/reset/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p><strong>Example 1</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Reset</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:reset value="Reset" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p><strong>Example 2</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=org.apache.struts2.components.Reset</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ Render a reset button:
+ &amp;lt;s:reset type="button" key="reset"/&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p>#####select##### {#PAGE_14127}</p>
@@ -1095,24 +1525,63 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Select</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Render an HTML input tag of type select.
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/select.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/select/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exnote|javadoc=true|lang=none|url=org.apache.struts2.components.Select</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+
+ Note: For any of the tags that use lists (select probably being the most ubiquitous), which uses the OGNL list
+ notation (see the "months" example above), it should be noted that the map key created (in the months example,
+ the '01', '02', etc.) is typed. '1' is a char, '01' is a String, "1" is a String. This is important since if
+ the value returned by your "value" attribute is NOT the same type as the key in the "list" attribute, they
+ WILL NOT MATCH, even though their String values may be equivalent. If they don't match, nothing in your list
+ will be auto-selected.
+
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=xml|url=org.apache.struts2.components.Select</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;s:select label="Pets"
+        name="petIds"
+        list="petDao.pets"
+        listKey="id"
+        listValue="name"
+        multiple="true"
+        size="3"
+        required="true"
+        value="%{petDao.pets.{id}}"
+ /&amp;gt;
+
+ &amp;lt;s:select label="Months"
+        name="months"
+        headerKey="-1" headerValue="Select Month"
+        list="#{'01':'Jan', '02':'Feb', [...]}"
+        value="selectedMonth"
+        required="true"
+ /&amp;gt;
+
+ // The month id (01, 02, ...) returned by the getSelectedMonth() call
+ // against the stack will be auto-selected
+
+```
+
+</code></pre>
 </div>
 
 <p>#####submit##### {#PAGE_14054}</p>
@@ -1128,8 +1597,16 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Submit</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Render a submit button. The submit tag is used together with the form tag to provide asynchronous form submissions.
+ The submit can have three different types of rendering:
+ &lt;ul&gt;
+ &lt;li&gt;input: renders as html &amp;lt;input type="submit"...&amp;gt;&lt;/li&gt;
+ &lt;li&gt;image: renders as html &amp;lt;input type="image"...&amp;gt;&lt;/li&gt;
+ &lt;li&gt;button: renders as html &amp;lt;button type="submit"...&amp;gt;&lt;/li&gt;
+ &lt;/ul&gt;
+ Please note that the button type has advantages by adding the possibility to seperate the submitted value from the
+ text shown on the button face, but has issues with Microsoft Internet Explorer at least up to 6.0
+</code></pre>
 </div>
 
 <table>
@@ -1158,36 +1635,44 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/submit.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/submit/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p>#####tabbedPanel##### {#PAGE_14222}</p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/a.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/a/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>The following is an example of a tabbedpanel and panel tag utilizing local and remote content:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Use notify topics to prevent a tab from being selected:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>#####textarea##### {#PAGE_13926}</p>
@@ -1203,20 +1688,24 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.TextArea</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Render HTML textarea tag.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/textarea.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/textarea/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Example</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.TextArea</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:textarea label="Comments" name="comments" cols="30" rows="8"/&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p>#####textfield##### {#PAGE_13912}</p>
@@ -1232,24 +1721,32 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.TextField</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Render an HTML input field of type text&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/textfield.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/textfield/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exdescription|lang=none|javadoc=true|url=org.apache.struts2.components.TextField</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+ In this example, a text control for the "user" property is rendered. The label is also retrieved from a ResourceBundle via the key attribute.
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.TextField</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:textfield key="user" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p>#####token##### {#PAGE_13998}</p>
@@ -1265,76 +1762,101 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Token</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Stop double-submission of forms.&lt;/p&gt;
+
+ &lt;p&gt;
+ The token tag is used to help with the "double click" submission problem. It is needed if you are using the
+ TokenInterceptor or the TokenSessionInterceptor. The s:token tag merely places a hidden element that contains
+ the unique token.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/token.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/token/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=xml|url=org.apache.struts2.components.Token</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:token /&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p>#####tree##### {#PAGE_14168}</p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/tree.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/tree/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>Static tree:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Dynamic tree (rendered on the server):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Dynamic tree loaded with AJAX (one request is made for each node):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>#####treenode##### {#PAGE_14288}</p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/treenode.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/treenode/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>Update target content with html returned from an action:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>#####updownselect##### {#PAGE_13884}</p>
@@ -1348,40 +1870,66 @@
   </tbody>
 </table>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=javadoc</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.ListUIBean}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ Note that the listkey and listvalue attribute will default to "key" and "value"
+ respectively only when the list attribute is evaluated to a Map or its descendant.
+ Everything else will result in listkey and listvalue to be null and not used.
+ </p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.UpDownSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Create a Select component with buttons to move the elements in the select component
+ up and down. When the containing form is submited, its elements will be submitted in
+ the order they are arranged (top to bottom).
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/updownselect.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/updownselect/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.UpDownSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;!-- Example 1: simple example --&amp;gt;
+ &amp;lt;s:updownselect
+ list="#{'england':'England', 'america':'America', 'germany':'Germany'}"
+ name="prioritisedFavouriteCountries"
+ headerKey="-1"
+ headerValue="--- Please Order Them Accordingly ---"
+ emptyOption="true" /&amp;gt;
+
+ &amp;lt;!-- Example 2: more complex example --&amp;gt;
+ &amp;lt;s:updownselect
+ list="defaultFavouriteCartoonCharacters"
+ name="prioritisedFavouriteCartoonCharacters"
+ headerKey="-1"
+ headerValue="--- Please Order ---"
+ emptyOption="true"
+ allowMoveUp="true"
+ allowMoveDown="true"
+ allowSelectAll="true"
+ moveUpLabel="Move Up"
+ moveDownLabel="Move Down"
+ selectAllLabel="Select All" /&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
 <p>####dojo anchor#### {#PAGE_66791}</p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p>There’s a bug in  IE6/IE7 which makes impossible to use the target’s attribute with a parent Div, because such Div’s content’s are overwritten with the tag’s <em>loadingText</em> . Resulting in an “undefined” message in the content’s, instead of the result of the request.</p>
@@ -1401,54 +1949,78 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/a.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/a/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>Update target content with html returned from an action:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Submit form(anchor inside the form):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Submit form(anchor outside the form):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using beforeNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example4|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example4 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using afterNotifyTopics and highlights target:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example5|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example5 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using errorNotifyTopics and indicator:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example6|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example6 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>####dojo submit#### {#PAGE_66801}</p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p>There’s a bug in  IE6/IE7 which makes impossible to use the target’s attribute with a parent Div, because such Div’s content’s are overwritten with the tag’s <em>loadingText</em> . Resulting in an “undefined” message in the content’s, instead of the result of the request.</p>
@@ -1468,62 +2040,98 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/submit.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/submit/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Render an image submit:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Render a button submit:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Update target content with html returned from an action:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example4|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example4 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Submit form(inside the form):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example5|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example5 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Submit form(outside the form):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example6|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example6 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using beforeNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example7|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example7 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using afterNotifyTopics and highlight target:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example8|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example8 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using errorNotifyTopics and indicator:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example9|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example9 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 
diff --git a/content/tag-developers/append-tag.html b/content/tag-developers/append-tag.html
index e47393a..eab1fcf 100644
--- a/content/tag-developers/append-tag.html
+++ b/content/tag-developers/append-tag.html
@@ -133,24 +133,86 @@
 
 <h2 id="description">Description</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.AppendIterator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Component for AppendIteratorTag, which jobs is to append iterators to form an
+ appended iterator whereby entries goes from one iterator to another after each
+ respective iterator is exhausted of entries.&lt;/p&gt;
+
+ &lt;p&gt;For example, if there are 3 iterator appended (each iterator has 3 entries),
+ the following will be how the appended iterator entries will be arranged:&lt;/p&gt;
+
+ &lt;ol&gt;
+      &lt;li&gt;First Entry of the First Iterator&lt;/li&gt;
+      &lt;li&gt;Second Entry of the First Iterator&lt;/li&gt;
+      &lt;li&gt;Third Entry of the First Iterator&lt;/li&gt;
+      &lt;li&gt;First Entry of the Second Iterator&lt;/li&gt;
+      &lt;li&gt;Second Entry of the Second Iterator&lt;/li&gt;
+      &lt;li&gt;Third Entry of the Second Iterator&lt;/li&gt;
+      &lt;li&gt;First Entry of the Third Iterator&lt;/li&gt;
+      &lt;li&gt;Second Entry of the Third Iterator&lt;/li&gt;
+      &lt;li&gt;Third Entry of the Third ITerator&lt;/li&gt;
+ &lt;/ol&gt;
+</code></pre>
 </div>
 
 <h2 id="parameters">Parameters</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/append.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/append/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <h2 id="example">Example</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=code|lang=java|javadoc=true|url=org.apache.struts2.components.AppendIterator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ public class AppendIteratorTagAction extends ActionSupport {
+
+  private List myList1;
+  private List myList2;
+  private List myList3;
+
+
+  public String execute() throws Exception {
+
+      myList1 = new ArrayList();
+      myList1.add("1");
+      myList1.add("2");
+      myList1.add("3");
+
+      myList2 = new ArrayList();
+      myList2.add("a");
+      myList2.add("b");
+      myList2.add("c");
+
+      myList3 = new ArrayList();
+      myList3.add("A");
+      myList3.add("B");
+      myList3.add("C");
+
+      return "done";
+  }
+
+  public List getMyList1() { return myList1; }
+  public List getMyList2() { return myList2; }
+  public List getMyList3() { return myList3; }
+}
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=xml|url=org.apache.struts2.components.AppendIterator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:append var="myAppendIterator"&amp;gt;
+      &amp;lt;s:param value="%{myList1}" /&amp;gt;
+      &amp;lt;s:param value="%{myList2}" /&amp;gt;
+      &amp;lt;s:param value="%{myList3}" /&amp;gt;
+ &amp;lt;/s:append&amp;gt;
+ &amp;lt;s:iterator value="%{#myAppendIterator}"&amp;gt;
+      &amp;lt;s:property /&amp;gt;
+ &amp;lt;/s:iterator&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/bean-tag.html b/content/tag-developers/bean-tag.html
index 6101f46..2339dc4 100644
--- a/content/tag-developers/bean-tag.html
+++ b/content/tag-developers/bean-tag.html
@@ -133,24 +133,59 @@
 
 <h2 id="description">Description</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Bean</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Instantiates a class that conforms to the JavaBeans specification. This tag has a body which can contain
+ a number of {@link Param} elements to set any mutator methods on that class.&lt;/p&gt;
+
+ &lt;p&gt;If the var attribute is set on the BeanTag, it will place the instantiated bean into the
+ stack's Context.&lt;/p&gt;
+
+</code></pre>
 </div>
 
 <h2 id="parameters">Parameters</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/bean.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/bean/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <h2 id="examples">Examples</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=examples|javadoc=true|lang=xml|url=org.apache.struts2.components.Bean</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;-- in freemarker form --&amp;gt;
+ [@s.bean name="org.apache.struts2.example.counter.SimpleCounter" var="counter"]
+   [s:param name="foo" value="BAR"/]
+   The value of foo is : [s:property value="foo"/], when inside the bean tag.
+ [/s:bean]
+
+ &amp;lt;-- in jsp form --&amp;gt;
+ &amp;lt;s:bean name="org.apache.struts2.example.counter.SimpleCounter" var="counter"&amp;gt;
+   &amp;lt;s:param name="foo" value="BAR" /&amp;gt;
+   The value of foot is : &amp;lt;s:property value="foo"/&amp;gt;, when inside the bean tag &amp;lt;br /&amp;gt;
+ &amp;lt;/s:bean&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=examplesdescription|javadoc=true|url=org.apache.struts2.components.Bean</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;This example instantiates a bean called SimpleCounter and sets the foo property (setFoo('BAR')). The
+ SimpleCounter object is then pushed onto the Valuestack, which means that we can call its accessor methods (getFoo())
+ with the Property tag and get their values.&lt;/p&gt;
+
+ &lt;p&gt;In the above example, the id has been set to a value of &lt;i&gt;counter&lt;/i&gt;. This means that the SimpleCounter class
+ will be placed into the stack's context. You can access the SimpleCounter class using a Struts tag:&lt;/p&gt;
+
+ &lt;pre&gt;
+ &amp;lt;-- jsp form --&amp;gt;
+ &amp;lt;s:property value="#counter" /&amp;gt;
+
+ &amp;lt;-- freemarker form --&amp;gt;
+ [s:property value="#counter.foo"/]
+ &lt;/pre&gt;
+
+ &lt;p&gt;In the property tag example, the &lt;i&gt;#&lt;/i&gt; tells Ognl to search the context for the SimpleCounter class which has
+ an id(key) of &lt;i&gt;counter&lt;/i&gt;&lt;/p&gt;
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/checkbox-tag.html b/content/tag-developers/checkbox-tag.html
index 3ab299d..56689b3 100644
--- a/content/tag-developers/checkbox-tag.html
+++ b/content/tag-developers/checkbox-tag.html
@@ -140,20 +140,32 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Checkbox</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Renders an HTML input element of type checkbox, populated by the specified property from the ValueStack.
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/checkbox.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/checkbox/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Checkbox</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ JSP:
+ &amp;lt;s:checkbox label="checkbox test" name="checkboxField1" value="aBoolean" fieldValue="true"/&amp;gt;
+
+ Velocity:
+ #tag( Checkbox "label=checkbox test" "name=checkboxField1" "value=aBoolean" )
+
+ Resulting HTML (simple template, aBoolean == true):
+ &amp;lt;input type="checkbox" name="checkboxField1" value="true" checked="checked" /&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/checkboxlist-tag.html b/content/tag-developers/checkboxlist-tag.html
index ee01628..43d6728 100644
--- a/content/tag-developers/checkboxlist-tag.html
+++ b/content/tag-developers/checkboxlist-tag.html
@@ -138,32 +138,34 @@
   </tbody>
 </table>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=javadoc</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.ListUIBean}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ Note that the listkey and listvalue attribute will default to "key" and "value"
+ respectively only when the list attribute is evaluated to a Map or its descendant.
+ Everything else will result in listkey and listvalue to be null and not used.
+ </p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.CheckboxList</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Creates a series of checkboxes from a list. Setup is like &amp;lt;s:select /&amp;gt; or &amp;lt;s:radio /&amp;gt;, but creates checkbox tags.
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/checkboxlist.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/checkboxlist/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.CheckboxList</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:checkboxlist name="foo" list="bar"/&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/combobox-tag.html b/content/tag-developers/combobox-tag.html
index 0462cee..2bf8bb0 100644
--- a/content/tag-developers/combobox-tag.html
+++ b/content/tag-developers/combobox-tag.html
@@ -140,20 +140,71 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.ComboBox</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ The combo box is basically an HTML INPUT of type text and HTML SELECT grouped together to give you a combo box
+ functionality. You can place text in the INPUT control by using the SELECT control or type it in directly in
+ the text field.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ In this example, the SELECT will be populated from id=year attribute. Counter is itself an Iterator. It will
+ span from first to last. The population is done via javascript, and requires that this tag be surrounded by a
+ &amp;lt;form&amp;gt;.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ Note that unlike the &amp;lt;s:select/&amp;gt; tag, there is no ability to define the individual &amp;lt;option&amp;gt; tags' id attribute
+ or content separately. Each of these is simply populated from the toString() method of the list item. Presumably
+ this is because the select box isn't intended to actually submit useful data, but to assist the user in filling
+ out the text field.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/combobox.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/combobox/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.ComboBox</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ JSP:
+ &amp;lt;-- Example One --&amp;gt;
+ &amp;lt;s:bean name="struts.util.Counter" var="year"&amp;gt;
+   &amp;lt;s:param name="first" value="text('firstBirthYear')"/&amp;gt;
+   &amp;lt;s:param name="last" value="2000"/&amp;gt;
+
+   &amp;lt;s:combobox label="Birth year" size="6" maxlength="4" name="birthYear" list="#year"/&amp;gt;
+ &amp;lt;/s:bean&amp;gt;
+
+ &amp;lt;-- Example Two --&amp;gt;
+ &amp;lt;s:combobox
+     label="My Favourite Fruit"
+     name="myFavouriteFruit"
+     list="{'apple','banana','grape','pear'}"
+     headerKey="-1"
+     headerValue="--- Please Select ---"
+     emptyOption="true"
+     value="banana" /&amp;gt;
+
+ &amp;lt;-- Example Two --&amp;gt;
+ &amp;lt;s:combobox
+    label="My Favourite Color"
+    name="myFavouriteColor"
+    list="#{'red':'red','green':'green','blue':'blue'}"
+    headerKey="-1"
+    headerValue="--- Please Select ---"
+    emptyOption="true"
+    value="green" /&amp;gt;
+
+ Velocity:
+ #tag( ComboBox "label=Birth year" "size=6" "maxlength=4" "name=birthYear" "list=#year" )
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/component-tag.html b/content/tag-developers/component-tag.html
index 9976bf5..aa86c4d 100644
--- a/content/tag-developers/component-tag.html
+++ b/content/tag-developers/component-tag.html
@@ -131,19 +131,47 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.GenericUIBean</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Renders an custom UI widget using the specified templates. Additional objects can be passed in to the template
+ using the param tags.
+ &lt;/p&gt;
+
+ &lt;p&gt;&lt;b&gt;Freemarker:&lt;/b&gt;&lt;/p&gt;
+ &lt;pre&gt;Objects provided can be retrieve from within the template via $parameters._paramname_.&lt;/pre&gt;
+
+ &lt;p&gt;&lt;b&gt;JSP:&lt;/b&gt;&lt;/p&gt;
+ &lt;pre&gt;Objects provided can be retrieve from within the template via &amp;lt;s:property value="%{parameters._paramname_}" /&amp;gt;&lt;/pre&gt;
+
+ &lt;p&gt;
+ In the bottom JSP and Velocity samples, two parameters are being passed in to the component. From within the
+ component, they can be accessed as:
+ &lt;/p&gt;
+
+ &lt;p&gt;&lt;b&gt;Freemarker:&lt;/b&gt;&lt;/p&gt;
+ &lt;pre&gt;$parameters.get('key1') and $parameters.get('key2') or $parameters.key1 and $parameters.key2&lt;/pre&gt;
+
+ &lt;p&gt;&lt;b&gt;JSP:&lt;/b&gt;&lt;/p&gt;
+ &lt;pre&gt;
+ &amp;lt;s:property value="%{parameters.key1}" /&amp;gt; and &amp;lt;s:property value="%{'parameters.key2'}" /&amp;gt; or
+ &amp;lt;s:property value="%{parameters.get('key1')}" /&amp;gt; and &amp;lt;s:property value="%{parameters.get('key2')}" /&amp;gt;
+ &lt;/pre&gt;
+
+ &lt;p&gt;
+ Currently, your custom UI components can be written in Velocity, JSP, or Freemarker, and the correct rendering
+ engine will be found based on file extension.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;Remember:&lt;/b&gt; the value params will always be resolved against the ValueStack so if you mean to pass a
+ string literal to your component, make sure to wrap it in single quotes i.e. value="'value1'" (note the opening "' and closing '" otherwise, the the value
+ stack will search for an Object on the stack with a method of getValue1().
+ &lt;/p&gt;
+</code></pre>
 </div>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=note</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.GenericUIBean}</td>
-    </tr>
-  </tbody>
-</table>
+<p>If Jsp is used as the template, the jsp template itself must lie within the
+ webapp itself and not the classpath. Unlike Freemarker or Velocity, JSP template
+ could not be picked up from the classpath.</p>
 
 <p><strong>(!) templateDir and theme attribute</strong></p>
 
@@ -177,14 +205,58 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/component.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/component/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.GenericUIBean</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &lt;p&gt;
+ JSP
+ &lt;/p&gt;
+ &lt;pre&gt;
+     &amp;lt;s:component template="/my/custom/component.vm"/&amp;gt;
+
+       or
+
+     &amp;lt;s:component template="/my/custom/component.vm"&amp;gt;
+       &amp;lt;s:param name="key1" value="value1"/&amp;gt;
+       &amp;lt;s:param name="key2" value="value2"/&amp;gt;
+     &amp;lt;/s:component&amp;gt;
+ &lt;/pre&gt;
+
+ &lt;p&gt;
+ Velocity
+ &lt;/p&gt;
+ &lt;pre&gt;
+     #s-component( "template=/my/custom/component.vm" )
+
+       or
+
+     #s-component( "template=/my/custom/component.vm" )
+       #s-param( "name=key1" "value=value1" )
+       #s-param( "name=key2" "value=value2" )
+     #end
+ &lt;/pre&gt;
+
+ &lt;p&gt;
+ Freemarker
+ &lt;/p&gt;
+ &lt;pre&gt;
+    &amp;lt;@s..component template="/my/custom/component.ftl" /&amp;gt;
+
+      or
+
+    &amp;lt;@s..component template="/my/custom/component.ftl"&amp;gt;
+       &amp;lt;@s..param name="key1" value="%{'value1'}" /&amp;gt;
+       &amp;lt;@s..param name="key2" value="%{'value2'}" /&amp;gt;
+    &amp;lt;/@s..component&amp;gt;
+ &lt;/pre&gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/date-tag.html b/content/tag-developers/date-tag.html
index 054297d..07d76a3 100644
--- a/content/tag-developers/date-tag.html
+++ b/content/tag-developers/date-tag.html
@@ -131,20 +131,118 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Date</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Format Date object in different ways.
+ &lt;p&gt;
+ The date tag will allow you to format a Date in a quick and easy way.
+ You can specify a &lt;b&gt;custom format&lt;/b&gt; (eg. "dd/MM/yyyy hh:mm"), you can generate
+ &lt;b&gt;easy readable notations&lt;/b&gt; (like "in 2 hours, 14 minutes"), or you can just fall back
+ on a &lt;b&gt;predefined format&lt;/b&gt; with key 'struts.date.format' in your properties file.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ If that key is not defined, it will finally fall back to the default DateFormat.MEDIUM
+ formatting.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;Note&lt;/b&gt;: If the requested Date object isn't found on the stack, a blank will be returned.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ Configurable attributes are:
+ &lt;/p&gt;
+
+ &lt;ul&gt;
+    &lt;li&gt;name&lt;/li&gt;
+    &lt;li&gt;nice&lt;/li&gt;
+    &lt;li&gt;format&lt;/li&gt;
+ &lt;/ul&gt;
+
+ &lt;p&gt;
+ Following how the date component will work, depending on the value of nice attribute
+ (which by default is false) and the format attribute.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;&lt;u&gt;Condition 1: With nice attribute as true&lt;/u&gt;&lt;/b&gt;
+ &lt;/p&gt;
+ &lt;table border="1" summary=""&gt;
+   &lt;tr&gt;
+      &lt;td&gt;i18n key&lt;/td&gt;
+      &lt;td&gt;default&lt;/td&gt;
+   &lt;/tr&gt;
+   &lt;tr&gt;
+      &lt;td&gt;struts.date.format.past&lt;/td&gt;
+      &lt;td&gt;&amp;#x7b;0&amp;#x7d; ago&lt;/td&gt;
+   &lt;/tr&gt;
+   &lt;tr&gt;
+      &lt;td&gt;struts.date.format.future&lt;/td&gt;
+      &lt;td&gt;in &amp;#x7b;0&amp;#x7d;&lt;/td&gt;
+   &lt;/tr&gt;
+   &lt;tr&gt;
+      &lt;td&gt;struts.date.format.seconds&lt;/td&gt;
+      &lt;td&gt;an instant&lt;/td&gt;
+   &lt;/tr&gt;
+   &lt;tr&gt;
+      &lt;td&gt;struts.date.format.minutes&lt;/td&gt;
+      &lt;td&gt;&amp;#x7b;0,choice,1#one minute|1&amp;lt;&amp;#x7b;0&amp;#x7d; minutes&amp;#x7d;&lt;/td&gt;
+   &lt;/tr&gt;
+   &lt;tr&gt;
+      &lt;td&gt;struts.date.format.hours&lt;/td&gt;
+      &lt;td&gt;&amp;#x7b;0,choice,1#one hour|1&amp;lt;&amp;#x7b;0&amp;#x7d; hours&amp;#x7d;&amp;#x7b;1,choice,0#|1#, one minute|1&amp;lt;, &amp;#x7b;1&amp;#x7d; minutes&amp;#x7d;&lt;/td&gt;
+   &lt;/tr&gt;
+   &lt;tr&gt;
+      &lt;td&gt;struts.date.format.days&lt;/td&gt;
+      &lt;td&gt;&amp;#x7b;0,choice,1#one day|1&amp;lt;&amp;#x7b;0&amp;#x7d; days&amp;#x7d;&amp;#x7b;1,choice,0#|1#, one hour|1&amp;lt;, &amp;#x7b;1&amp;#x7d; hours&amp;#x7d;&lt;/td&gt;
+   &lt;/tr&gt;
+   &lt;tr&gt;
+      &lt;td&gt;struts.date.format.years&lt;/td&gt;
+      &lt;td&gt;&amp;#x7b;0,choice,1#one year|1&amp;lt;&amp;#x7b;0&amp;#x7d; years&amp;#x7d;&amp;#x7b;1,choice,0#|1#, one day|1&amp;lt;, &amp;#x7b;1&amp;#x7d; days&amp;#x7d;&lt;/td&gt;
+   &lt;/tr&gt;
+ &lt;/table&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;&lt;u&gt;Condition 2: With nice attribute as false and format attribute is specified eg. dd/MM/yyyyy &lt;/u&gt;&lt;/b&gt;
+ &lt;/p&gt;
+
+ &lt;p&gt;In this case the format attribute will be used.&lt;/p&gt;
+
+ &lt;p&gt;
+ &lt;b&gt;&lt;u&gt;Condition 3: With nice attribute as false and no format attribute is specified &lt;/u&gt;&lt;/b&gt;
+ &lt;/p&gt;
+ &lt;table border="1" summary=""&gt;
+    &lt;tr&gt;
+      &lt;td&gt;i18n key&lt;/td&gt;
+      &lt;td&gt;default&lt;/td&gt;
+   &lt;/tr&gt;
+   &lt;tr&gt;
+      &lt;td&gt;struts.date.format&lt;/td&gt;
+      &lt;td&gt;if one is not found DateFormat.MEDIUM format will be used&lt;/td&gt;
+   &lt;/tr&gt;
+ &lt;/table&gt;
+
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/date.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/date/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Date</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+  &amp;lt;s:date name="person.birthday" format="dd/MM/yyyy" /&amp;gt;
+  &amp;lt;s:date name="person.birthday" format="%{getText('some.i18n.key')}" /&amp;gt;
+  &amp;lt;s:date name="person.birthday" nice="true" /&amp;gt;
+  &amp;lt;s:date name="person.birthday" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/datetextfield-tag.html b/content/tag-developers/datetextfield-tag.html
index 17f09bb..fb27d0b 100644
--- a/content/tag-developers/datetextfield-tag.html
+++ b/content/tag-developers/datetextfield-tag.html
@@ -140,20 +140,24 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.DateTextField</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/components/DateTextField.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/datetextfield.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/datetextfield/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.DateTextField</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/components/DateTextField.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/div-tag.html b/content/tag-developers/div-tag.html
index 400f32f..68e11ba 100644
--- a/content/tag-developers/div-tag.html
+++ b/content/tag-developers/div-tag.html
@@ -131,8 +131,8 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Div</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/components/Div.java;hb=HEAD
+</code></pre>
 </div>
 
 <table>
@@ -152,8 +152,8 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/div.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/div/html.java;hb=HEAD
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/dojo-a-tag.html b/content/tag-developers/dojo-a-tag.html
index 21f5cae..9043211 100644
--- a/content/tag-developers/dojo-a-tag.html
+++ b/content/tag-developers/dojo-a-tag.html
@@ -131,8 +131,8 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p>There’s a bug in  IE6/IE7 which makes impossible to use the target’s attribute with a parent Div, because such Div’s content’s are overwritten with the tag’s <em>loadingText</em> . Resulting in an “undefined” message in the content’s, instead of the result of the request.</p>
@@ -152,46 +152,70 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/a.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/a/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>Update target content with html returned from an action:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Submit form(anchor inside the form):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Submit form(anchor outside the form):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using beforeNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example4|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example4 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using afterNotifyTopics and highlights target:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example5|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example5 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using errorNotifyTopics and indicator:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example6|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example6 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/dojo-autocompleter-tag.html b/content/tag-developers/dojo-autocompleter-tag.html
index 21f7429..8008534 100644
--- a/content/tag-developers/dojo-autocompleter-tag.html
+++ b/content/tag-developers/dojo-autocompleter-tag.html
@@ -131,70 +131,106 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/autocompleter.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/autocompleter/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>Get list from an action:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Uses a list:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Autocompleter that reloads its content everytime the text changes (and the length of the text is greater than 3):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Linking two autocompleters:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example4|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example4 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Set/Get selected values using JavaScript:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example5|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example5 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using beforeNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example6|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example6 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using errorNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example7|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example7 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using errorNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example8|lang=html|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```html
+START SNIPPET: example8 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using valueNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example9|lang=html|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```html
+START SNIPPET: example9 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p><strong>Caveats</strong></p>
diff --git a/content/tag-developers/dojo-bind-tag.html b/content/tag-developers/dojo-bind-tag.html
index 6ed607d..0cf8292 100644
--- a/content/tag-developers/dojo-bind-tag.html
+++ b/content/tag-developers/dojo-bind-tag.html
@@ -131,8 +131,8 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p>There’s a bug in  IE6/IE7 which makes impossible to use the target’s attribute with a parent Div, because such Div’s content’s are overwritten with the tag’s <em>loadingText</em> . Resulting in an “undefined” message in the content’s, instead of the result of the request.</p>
@@ -153,46 +153,70 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/bind.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/bind/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>Without attaching to an event, listening to a topic (used to make an Ajax call):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example0|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example0 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Attached to event ‘onclick’ on submit button:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Submit form:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using beforeNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example4|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example4 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using afterNotifyTopics and highlight:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example5|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example5 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using errorNotifyTopics and indicator:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example6|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example6 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 
diff --git a/content/tag-developers/dojo-datetimepicker-tag.html b/content/tag-developers/dojo-datetimepicker-tag.html
index 79d9f58..762dbcc 100644
--- a/content/tag-developers/dojo-datetimepicker-tag.html
+++ b/content/tag-developers/dojo-datetimepicker-tag.html
@@ -131,32 +131,44 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/datetimepicker.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/datetimepicker/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Getting and getting the datetimepicker value, from JavaScript:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Publish topic when value changes</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/dojo-div-tag.html b/content/tag-developers/dojo-div-tag.html
index 141743d..a065ffe 100644
--- a/content/tag-developers/dojo-div-tag.html
+++ b/content/tag-developers/dojo-div-tag.html
@@ -131,34 +131,46 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/div.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/div/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>Simple div that loads its content once:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>div that reloads its content every 2 seconds, and shows an indicator while reloading:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>div that uses topics to control the timer, highlights its content in red after reload, and submits a form:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/dojo-head-tag.html b/content/tag-developers/dojo-head-tag.html
index a711382..0220bda 100644
--- a/content/tag-developers/dojo-head-tag.html
+++ b/content/tag-developers/dojo-head-tag.html
@@ -131,18 +131,10 @@
 
 <p><strong>Description</strong></p>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=notice</td>
-      <td>javadoc=true</td>
-      <td>url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java}</td>
-    </tr>
-  </tbody>
-</table>
-
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<p>START SNIPPET: notice not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head/java.java;hb=HEAD</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <blockquote>
@@ -163,18 +155,26 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/head.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/head/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/dojo-submit-tag.html b/content/tag-developers/dojo-submit-tag.html
index a343a9c..e9d9ae2 100644
--- a/content/tag-developers/dojo-submit-tag.html
+++ b/content/tag-developers/dojo-submit-tag.html
@@ -131,8 +131,8 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p>There’s a bug in  IE6/IE7 which makes impossible to use the target’s attribute with a parent Div, because such Div’s content’s are overwritten with the tag’s <em>loadingText</em> . Resulting in an “undefined” message in the content’s, instead of the result of the request.</p>
@@ -152,62 +152,98 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/submit.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/submit/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Render an image submit:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Render a button submit:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Update target content with html returned from an action:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example4|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example4 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Submit form(inside the form):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example5|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example5 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Submit form(outside the form):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example6|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example6 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using beforeNotifyTopics:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example7|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example7 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using afterNotifyTopics and highlight target:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example8|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example8 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Using errorNotifyTopics and indicator:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example9|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example9 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 
diff --git a/content/tag-developers/dojo-tabbedpanel-tag.html b/content/tag-developers/dojo-tabbedpanel-tag.html
index 4fbbb59..a2fa258 100644
--- a/content/tag-developers/dojo-tabbedpanel-tag.html
+++ b/content/tag-developers/dojo-tabbedpanel-tag.html
@@ -131,28 +131,36 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/a.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/a/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>The following is an example of a tabbedpanel and panel tag utilizing local and remote content:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Use notify topics to prevent a tab from being selected:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/dojo-textarea-tag.html b/content/tag-developers/dojo-textarea-tag.html
index cb3fba8..b5e6246 100644
--- a/content/tag-developers/dojo-textarea-tag.html
+++ b/content/tag-developers/dojo-textarea-tag.html
@@ -131,14 +131,14 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TextArea.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TextArea/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/textarea.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/textarea/html.java;hb=HEAD
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/dojo-tree-tag.html b/content/tag-developers/dojo-tree-tag.html
index af84342..a0c086a 100644
--- a/content/tag-developers/dojo-tree-tag.html
+++ b/content/tag-developers/dojo-tree-tag.html
@@ -131,34 +131,46 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/tree.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/tree/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>Static tree:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example1 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Dynamic tree (rendered on the server):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example2 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
 <p>Dynamic tree loaded with AJAX (one request is made for each node):</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example3 not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/dojo-treenode-tag.html b/content/tag-developers/dojo-treenode-tag.html
index d3b2359..bcf1bc7 100644
--- a/content/tag-developers/dojo-treenode-tag.html
+++ b/content/tag-developers/dojo-treenode-tag.html
@@ -131,22 +131,26 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: javadoc not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode/java.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/ajax/treenode.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/ajax/treenode/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p>Update target content with html returned from an action:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/doubleselect-tag.html b/content/tag-developers/doubleselect-tag.html
index a804f2b..b785bc8 100644
--- a/content/tag-developers/doubleselect-tag.html
+++ b/content/tag-developers/doubleselect-tag.html
@@ -138,32 +138,33 @@
   </tbody>
 </table>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=javadoc</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.DoubleListUIBean}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ Note that the doublelistkey and doublelistvalue attribute will default to "key" and "value"
+ respectively only when the doublelist attribute is evaluated to a Map or its descendant.
+ Other thing else, will result in doublelistkey and doublelistvalue to be null and not used.
+ </p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.DoubleSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Renders two HTML select elements with second one changing displayed values depending on selected entry of first one.
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/doubleselect.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/doubleselect/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.DoubleSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:doubleselect label="doubleselect test1" name="menu" list="{'fruit','other'}" doubleName="dishes" doubleList="top == 'fruit' ? {'apple', 'orange'} : {'monkey', 'chicken'}" /&amp;gt;
+ &amp;lt;s:doubleselect label="doubleselect test2" name="menu" list="#{'fruit':'Nice Fruits', 'other':'Other Dishes'}" doubleName="dishes" doubleList="top == 'fruit' ? {'apple', 'orange'} : {'monkey', 'chicken'}" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/else-tag.html b/content/tag-developers/else-tag.html
index e125401..2be471c 100644
--- a/content/tag-developers/else-tag.html
+++ b/content/tag-developers/else-tag.html
@@ -140,20 +140,35 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Else</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;Perform basic condition flow. 'If' tag could be used by itself or with 'Else If' Tag and/or single/multiple 'Else'
+ Tag.&lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/else.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/else/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Else</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+  &amp;lt;s:if test="%{false}"&amp;gt;
+      &amp;lt;div&amp;gt;Will Not Be Executed&amp;lt;/div&amp;gt;
+  &amp;lt;/s:if&amp;gt;
+  &amp;lt;s:elseif test="%{true}"&amp;gt;
+      &amp;lt;div&amp;gt;Will Be Executed&amp;lt;/div&amp;gt;
+  &amp;lt;/s:elseif&amp;gt;
+  &amp;lt;s:else&amp;gt;
+      &amp;lt;div&amp;gt;Will Not Be Executed&amp;lt;/div&amp;gt;
+  &amp;lt;/s:else&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/elseif-tag.html b/content/tag-developers/elseif-tag.html
index 50d6a17..bbe4508 100644
--- a/content/tag-developers/elseif-tag.html
+++ b/content/tag-developers/elseif-tag.html
@@ -140,20 +140,35 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.ElseIf</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;Perform basic condition flow. 'If' tag could be used by itself or with 'Else If' Tag and/or single/multiple 'Else'
+ Tag.&lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/elseif.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/elseif/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.ElseIf</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+  &amp;lt;s:if test="%{false}"&amp;gt;
+      &amp;lt;div&amp;gt;Will Not Be Executed&amp;lt;/div&amp;gt;
+  &amp;lt;/s:if&amp;gt;
+  &amp;lt;s:elseif test="%{true}"&amp;gt;
+      &amp;lt;div&amp;gt;Will Be Executed&amp;lt;/div&amp;gt;
+  &amp;lt;/s:elseif&amp;gt;
+  &amp;lt;s:else&amp;gt;
+      &amp;lt;div&amp;gt;Will Not Be Executed&amp;lt;/div&amp;gt;
+  &amp;lt;/s:else&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/fielderror-tag.html b/content/tag-developers/fielderror-tag.html
index 60b6dab..462188d 100644
--- a/content/tag-developers/fielderror-tag.html
+++ b/content/tag-developers/fielderror-tag.html
@@ -131,24 +131,60 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.FieldError</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Render field errors if they exists. Specific layout depends on the particular theme.
+ The field error strings will be html escaped by default.
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/fielderror.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/fielderror/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.FieldError</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+    &amp;lt;!-- example 1 --&amp;gt;
+    &amp;lt;s:fielderror /&amp;gt;
+
+    &amp;lt;!-- example 2 --&amp;gt;
+    &amp;lt;s:fielderror&amp;gt;
+         &amp;lt;s:param&amp;gt;field1&amp;lt;/s:param&amp;gt;
+         &amp;lt;s:param&amp;gt;field2&amp;lt;/s:param&amp;gt;
+    &amp;lt;/s:fielderror&amp;gt;
+    &amp;lt;s:form .... &amp;gt;
+       ....
+    &amp;lt;/s:form&amp;gt;
+
+    OR
+
+    &amp;lt;s:fielderror&amp;gt;
+          &amp;lt;s:param value="%{'field1'}" /&amp;gt;
+          &amp;lt;s:param value="%{'field2'}" /&amp;gt;
+    &amp;lt;/s:fielderror&amp;gt;
+    &amp;lt;s:form .... &amp;gt;
+       ....
+    &amp;lt;/s:form&amp;gt;
+
+    OR
+
+    &amp;lt;s:fielderror fieldName="field1" /&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=description|javadoc=true|url=org.apache.struts2.components.FieldError</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Example 1: display all field errors&lt;br&gt;
+ Example 2: display field errors only for 'field1' and 'field2'&lt;br&gt;
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/file-tag.html b/content/tag-developers/file-tag.html
index 3fd9577..f2fd8d8 100644
--- a/content/tag-developers/file-tag.html
+++ b/content/tag-developers/file-tag.html
@@ -140,20 +140,25 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.File</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Renders an HTML file input element.
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/file.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/file/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.File</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:file name="anUploadFile" accept="text/*" /&amp;gt;
+ &amp;lt;s:file name="anohterUploadFIle" accept="text/html,text/plain" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/form-tag.html b/content/tag-developers/form-tag.html
index 86e70d2..ae9a6ef 100644
--- a/content/tag-developers/form-tag.html
+++ b/content/tag-developers/form-tag.html
@@ -140,20 +140,54 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Form</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Renders HTML an input form.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ The remote form allows the form to be submitted without the page being refreshed. The results from the form
+ can be inserted into any HTML element on the page.
+ &lt;/p&gt;
+ &lt;p&gt;
+ NOTE:&lt;br&gt;
+ The order / logic in determining the posting url of the generated HTML form is as follows:
+ &lt;/p&gt;
+
+ &lt;ol&gt;
+ &lt;li&gt;
+ If the action attribute is not specified, then the current request will be used to
+ determine the posting url
+ &lt;/li&gt;
+ &lt;li&gt;
+ If the action is given, Struts will try to obtain an ActionConfig. This will be
+ successful if the action attribute is a valid action alias defined struts.xml.
+ &lt;/li&gt;
+ &lt;li&gt;
+ If the action is given and is not an action alias defined in struts.xml, Struts
+ will used the action attribute as if it is the posting url, separting the namespace
+ from it and using UrlHelper to generate the final url.
+ &lt;/li&gt;
+ &lt;/ol&gt;
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/form.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/form/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Form</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;s:form ... /&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
 <p><strong>Validation</strong></p>
diff --git a/content/tag-developers/form-tags.html b/content/tag-developers/form-tags.html
index 4b8aa5b..5df383e 100644
--- a/content/tag-developers/form-tags.html
+++ b/content/tag-developers/form-tags.html
@@ -215,26 +215,298 @@
 
 <p><strong>Template-Related Attributes</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=templateRelatedAttributes|javadoc=true|url=org.apache.struts2.components.UIBean</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;table border="1" summary=""&gt;
+    &lt;thead&gt;
+       &lt;tr&gt;
+          &lt;td&gt;Attribute&lt;/td&gt;
+          &lt;td&gt;Theme&lt;/td&gt;
+          &lt;td&gt;Data Types&lt;/td&gt;
+          &lt;td&gt;Description&lt;/td&gt;
+       &lt;/tr&gt;
+    &lt;/thead&gt;
+    &lt;tbody&gt;
+       &lt;tr&gt;
+          &lt;td&gt;templateDir&lt;/td&gt;
+          &lt;td&gt;n/a&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;define the template directory&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;theme&lt;/td&gt;
+          &lt;td&gt;n/a&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;define the theme name&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;template&lt;/td&gt;
+          &lt;td&gt;n/a&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;define the template name&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;themeExpansionToken&lt;/td&gt;
+          &lt;td&gt;n/a&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;special token (defined with struts.ui.theme.expansion.token) used to search for template in parent theme
+          (don't use it separately!)&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;expandTheme&lt;/td&gt;
+          &lt;td&gt;n/a&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;concatenation of themeExpansionToken and theme which tells internal template loader mechanism
+          to try load template from current theme and then from parent theme (and parent theme, and so on)
+          when used with &amp;lt;#include/&amp;gt; directive&lt;/td&gt;
+       &lt;/tr&gt;
+    &lt;/tbody&gt;
+ &lt;/table&gt;
+
+</code></pre>
 </div>
 
 <p><strong>Javascript-Related Attributes</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javascriptRelatedAttributes|javadoc=true|url=org.apache.struts2.components.UIBean</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;table border="1" summary=""&gt;
+    &lt;thead&gt;
+       &lt;tr&gt;
+          &lt;td&gt;Attribute&lt;/td&gt;
+          &lt;td&gt;Theme&lt;/td&gt;
+          &lt;td&gt;Data Types&lt;/td&gt;
+          &lt;td&gt;Description&lt;/td&gt;
+       &lt;/tr&gt;
+    &lt;/thead&gt;
+    &lt;tbody&gt;
+       &lt;tr&gt;
+          &lt;td&gt;onclick&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;html javascript onclick attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;ondblclick&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;html javascript ondbclick attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;onmousedown&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;html javascript onmousedown attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;onmouseup&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;html javascript onmouseup attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;onmouseover&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;html javascript onmouseover attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;onmouseout&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;html javascript onmouseout attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;onfocus&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;html javascript onfocus attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;onblur&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;html javascript onblur attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;onkeypress&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;html javascript onkeypress attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;onkeyup&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;html javascript onkeyup attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;onkeydown&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;html javascript onkeydown attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;onselect&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;html javascript onselect attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;onchange&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;html javascript onchange attribute&lt;/td&gt;
+       &lt;/tr&gt;
+    &lt;/tbody&gt;
+ &lt;/table&gt;
+
+</code></pre>
 </div>
 
 <p><strong>Tooltip Related Attributes</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tooltipattributes|javadoc=true|url=org.apache.struts2.components.UIBean</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;table border="1" summary=""&gt;
+  &lt;tr&gt;
+     &lt;td&gt;Attribute&lt;/td&gt;
+     &lt;td&gt;Data Type&lt;/td&gt;
+     &lt;td&gt;Default&lt;/td&gt;
+     &lt;td&gt;Description&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;
+      &lt;td&gt;tooltip&lt;/td&gt;
+      &lt;td&gt;String&lt;/td&gt;
+      &lt;td&gt;none&lt;/td&gt;
+      &lt;td&gt;Set the tooltip of this particular component&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;
+      &lt;td&gt;jsTooltipEnabled&lt;/td&gt;
+      &lt;td&gt;String&lt;/td&gt;
+      &lt;td&gt;false&lt;/td&gt;
+      &lt;td&gt;Enable js tooltip rendering&lt;/td&gt;
+  &lt;/tr&gt;
+    &lt;tr&gt;
+      &lt;td&gt;tooltipIcon&lt;/td&gt;
+      &lt;td&gt;String&lt;/td&gt;
+      &lt;td&gt;/struts/static/tooltip/tooltip.gif&lt;/td&gt;
+      &lt;td&gt;The url to the tooltip icon&lt;/td&gt;
+   &lt;tr&gt;
+      &lt;td&gt;tooltipDelay&lt;/td&gt;
+      &lt;td&gt;String&lt;/td&gt;
+      &lt;td&gt;500&lt;/td&gt;
+      &lt;td&gt;Tooltip shows up after the specified timeout (miliseconds). A behavior similar to that of OS based tooltips.&lt;/td&gt;
+   &lt;/tr&gt;
+   &lt;tr&gt;
+      &lt;td&gt;key&lt;/td&gt;
+      &lt;td&gt;simple&lt;/td&gt;
+      &lt;td&gt;String&lt;/td&gt;
+      &lt;td&gt;The name of the property this input field represents.  This will auto populate the name, label, and value&lt;/td&gt;
+   &lt;/tr&gt;
+ &lt;/table&gt;
+
+</code></pre>
 </div>
 
 <p><strong>General Attributes</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=generalAttributes|javadoc=true|url=org.apache.struts2.components.UIBean</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;table border="1" summary=""&gt;
+    &lt;thead&gt;
+       &lt;tr&gt;
+          &lt;td&gt;Attribute&lt;/td&gt;
+          &lt;td&gt;Theme&lt;/td&gt;
+          &lt;td&gt;Data Types&lt;/td&gt;
+          &lt;td&gt;Description&lt;/td&gt;
+       &lt;/tr&gt;
+    &lt;/thead&gt;
+    &lt;tbody&gt;
+       &lt;tr&gt;
+          &lt;td&gt;cssClass&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;define html class attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;cssStyle&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;define html style attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;cssErrorClass&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;error class attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;cssErrorStyle&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;error style attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;title&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;define html title attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;disabled&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;define html disabled attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;label&lt;/td&gt;
+          &lt;td&gt;xhtml&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;define label of form element&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;labelPosition&lt;/td&gt;
+          &lt;td&gt;xhtml&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;define label position of form element (top/left), default to left&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;requiredPosition&lt;/td&gt;
+          &lt;td&gt;xhtml&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;define required label position of form element (left/right), default to right&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;errorPosition&lt;/td&gt;
+          &lt;td&gt;xhtml&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;define error position of form element (top|bottom), default to top&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;name&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;Form Element's field name mapping&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;requiredLabel&lt;/td&gt;
+          &lt;td&gt;xhtml&lt;/td&gt;
+          &lt;td&gt;Boolean&lt;/td&gt;
+          &lt;td&gt;add * to label (true to add false otherwise)&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;tabIndex&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;String&lt;/td&gt;
+          &lt;td&gt;define html tabindex attribute&lt;/td&gt;
+       &lt;/tr&gt;
+       &lt;tr&gt;
+          &lt;td&gt;value&lt;/td&gt;
+          &lt;td&gt;simple&lt;/td&gt;
+          &lt;td&gt;Object&lt;/td&gt;
+          &lt;td&gt;define value of form element&lt;/td&gt;
+       &lt;/tr&gt;
+    &lt;/tbody&gt;
+ &lt;/table&gt;
+
+</code></pre>
 </div>
 
 <table>
@@ -417,12 +689,98 @@
 
 <p><strong>Tooltip</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tooltipdescription|javadoc=true|url=org.apache.struts2.components.UIBean</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ &lt;b&gt;tooltipConfig is deprecated, use individual tooltip configuration attributes instead &lt;/b&gt;
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ Every Form UI component (in xhtml / css_xhtml or any other that extends them) can
+ have tooltips assigned to them. The Form component's tooltip related attribute, once
+ defined, will be applied to all form UI components that are created under it unless
+ explicitly overridden by having the Form UI component itself defined with their own tooltip attribute.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ In Example 1, the textfield will inherit the tooltipDelay and tooltipIconPath attribute from
+ its containing form. In other words, although it doesn't define a tooltipIconPath
+ attribute, it will have that attribute inherited from its containing form.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ In Example 2, the  textfield will inherit both the tooltipDelay and
+ tooltipIconPath attribute from its containing form, but the tooltipDelay
+ attribute is overridden at the textfield itself. Hence, the textfield actually will
+ have its tooltipIcon defined as /myImages/myIcon.gif, inherited from its containing form, and
+ tooltipDelay defined as 5000.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ Example 3, 4 and 5 show different ways of setting the tooltip configuration attribute.&lt;br&gt;
+ &lt;b&gt;Example 3:&lt;/b&gt; Set tooltip config through the body of the param tag&lt;br&gt;
+ &lt;b&gt;Example 4:&lt;/b&gt; Set tooltip config through the value attribute of the param tag&lt;br&gt;
+ &lt;b&gt;Example 5:&lt;/b&gt; Set tooltip config through the tooltip attributes of the component tag&lt;br&gt;
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tooltipexample|lang=xml|javadoc=true|url=org.apache.struts2.components.UIBean</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;!-- Example 1: --&amp;gt;
+ &amp;lt;s:form
+          tooltipDelay="500"
+          tooltipIconPath="/myImages/myIcon.gif" .... &amp;gt;
+   ....
+     &amp;lt;s:textfield label="Customer Name" tooltip="Enter the customer name" .... /&amp;gt;
+   ....
+ &amp;lt;/s:form&amp;gt;
+
+ &amp;lt;!-- Example 2: --&amp;gt;
+ &amp;lt;s:form
+          tooltipDelay="500"
+          tooltipIconPath="/myImages/myIcon.gif" .... &amp;gt;
+   ....
+     &amp;lt;s:textfield label="Address"
+          tooltip="Enter your address"
+          tooltipDelay="5000" /&amp;gt;
+   ....
+ &amp;lt;/s:form&amp;gt;
+
+
+ &amp;lt;-- Example 3: --&amp;gt;
+ &amp;lt;s:textfield
+        label="Customer Name"
+        tooltip="One of our customer Details"&amp;gt;
+        &amp;lt;s:param name="tooltipDelay"&amp;gt;
+             500
+        &amp;lt;/s:param&amp;gt;
+        &amp;lt;s:param name="tooltipIconPath"&amp;gt;
+             /myImages/myIcon.gif
+        &amp;lt;/s:param&amp;gt;
+ &amp;lt;/s:textfield&amp;gt;
+
+
+ &amp;lt;-- Example 4: --&amp;gt;
+ &amp;lt;s:textfield
+          label="Customer Address"
+          tooltip="Enter The Customer Address" &amp;gt;
+          &amp;lt;s:param
+              name="tooltipDelay"
+              value="500" /&amp;gt;
+ &amp;lt;/s:textfield&amp;gt;
+
+
+ &amp;lt;-- Example 5: --&amp;gt;
+ &amp;lt;s:textfield
+          label="Customer Telephone Number"
+          tooltip="Enter customer Telephone Number"
+          tooltipDelay="500"
+          tooltipIconPath="/myImages/myIcon.gif" /&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/generator-tag.html b/content/tag-developers/generator-tag.html
index 0f11af8..f29ef55 100644
--- a/content/tag-developers/generator-tag.html
+++ b/content/tag-developers/generator-tag.html
@@ -131,20 +131,95 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;b&gt;NOTE: JSP-TAG&lt;/b&gt;
+
+ &lt;p&gt;Generate an iterator based on the val attribute supplied.&lt;/P&gt;
+
+ &lt;b&gt;NOTE:&lt;/b&gt; The generated iterator will &lt;b&gt;ALWAYS&lt;/b&gt; be pushed into the top of the stack, and poped
+ at the end of the tag.
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/generator.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/generator/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ Example One:
+ &lt;pre&gt;
+ Generate a simple iterator
+ &amp;lt;s:generator val="%{'aaa,bbb,ccc,ddd,eee'}"&amp;gt;
+  &amp;lt;s:iterator&amp;gt;
+      &amp;lt;s:property /&amp;gt;&amp;lt;br/&amp;gt;
+  &amp;lt;/s:iterator&amp;gt;
+ &amp;lt;/s:generator&amp;gt;
+ &lt;/pre&gt;
+ This generates an iterator and print it out using the iterator tag.
+
+ Example Two:
+ &lt;pre&gt;
+ Generate an iterator with count attribute
+ &amp;lt;s:generator val="%{'aaa,bbb,ccc,ddd,eee'}" count="3"&amp;gt;
+  &amp;lt;s:iterator&amp;gt;
+      &amp;lt;s:property /&amp;gt;&amp;lt;br/&amp;gt;
+  &amp;lt;/s:iterator&amp;gt;
+ &amp;lt;/s:generator&amp;gt;
+ &lt;/pre&gt;
+ This generates an iterator, but only 3 entries will be available in the iterator
+ generated, namely aaa, bbb and ccc respectively because count attribute is set to 3
+
+ Example Three:
+ &lt;pre&gt;
+ Generate an iterator with var attribute
+ &amp;lt;s:generator val="%{'aaa,bbb,ccc,ddd,eee'}" count="4" separator="," var="myAtt" /&amp;gt;
+ &amp;lt;%
+  Iterator i = (Iterator) pageContext.getAttribute("myAtt");
+  while(i.hasNext()) {
+      String s = (String) i.next(); %&amp;gt;
+      &amp;lt;%=s%&amp;gt; &amp;lt;br/&amp;gt;
+ &amp;lt;%    }
+ %&amp;gt;
+ &lt;/pre&gt;
+ This generates an iterator and put it in the PageContext under the key as specified
+ by the var attribute.
+
+
+ Example Four:
+ &lt;pre&gt;
+ Generate an iterator with comparator attribute
+ &amp;lt;s:generator val="%{'aaa,bbb,ccc,ddd,eee'}" converter="%{myConverter}"&amp;gt;
+  &amp;lt;s:iterator&amp;gt;
+      &amp;lt;s:property /&amp;gt;&amp;lt;br/&amp;gt;
+  &amp;lt;/s:iterator&amp;gt;
+ &amp;lt;/s:generator&amp;gt;
+
+
+ public class GeneratorTagAction extends ActionSupport {
+
+   ....
+
+   public Converter getMyConverter() {
+      return new Converter() {
+          public Object convert(String value) throws Exception {
+              return "converter-"+value;
+          }
+      };
+   }
+
+   ...
+
+ }
+ &lt;/pre&gt;
+ This will generate an iterator with each entries decided by the converter supplied. With
+ this converter, it simply add "converter-" to each entries.
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/head-tag.html b/content/tag-developers/head-tag.html
index 3d88ade..af555c6 100644
--- a/content/tag-developers/head-tag.html
+++ b/content/tag-developers/head-tag.html
@@ -140,20 +140,28 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Head</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Renders parts of the HEAD section for an HTML file. Encoding can be set using this tag.
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/head.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/head/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=org.apache.struts2.components.Head</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;head&amp;gt;
+   &amp;lt;title&amp;gt;My page&amp;lt;/title&amp;gt;
+   &amp;lt;s:head/&amp;gt;
+ &amp;lt;/head&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/hidden-tag.html b/content/tag-developers/hidden-tag.html
index 21b8585..8ae0ec9 100644
--- a/content/tag-developers/hidden-tag.html
+++ b/content/tag-developers/hidden-tag.html
@@ -140,20 +140,32 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Hidden</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Renders an HTML input element of type hidden, populated by the specified property from the ValueStack.
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/hidden.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/hidden/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Hidden</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;-- example one --&amp;gt;
+ &amp;lt;s:hidden name="foo" /&amp;gt;
+ &amp;lt;-- example two --&amp;gt;
+ &amp;lt;s:hidden name="foo" value="%{bar}" /&amp;gt;
+
+ Example One Resulting HTML (if foo evaluates to bar):
+ &amp;lt;input type="hidden" name="foo" value="bar" /&amp;gt;
+ Example Two Resulting HTML (if getBar method of the action returns 'bar')
+ &amp;lt;input type="hidden" name="foo" value="bar" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/i18n-tag.html b/content/tag-developers/i18n-tag.html
index 3435b92..e99965e 100644
--- a/content/tag-developers/i18n-tag.html
+++ b/content/tag-developers/i18n-tag.html
@@ -140,20 +140,32 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.I18n</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Gets a resource bundle and place it on the value stack. This allows
+ the text tag to access messages from any bundle, and not just the bundle
+ associated with the current action.
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/i18n.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/i18n/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.I18n</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;s:i18n name="myCustomBundle"&amp;gt;
+    The i18n value for key aaa.bbb.ccc in myCustomBundle is &amp;lt;s:property value="text('aaa.bbb.ccc')" /&amp;gt;
+ &amp;lt;/s:i18n&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/if-tag.html b/content/tag-developers/if-tag.html
index 6e1f58d..97492ae 100644
--- a/content/tag-developers/if-tag.html
+++ b/content/tag-developers/if-tag.html
@@ -144,14 +144,18 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/if.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/if/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=struts2/core/src/main/java/org/apache/struts2/components/If.java</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+START SNIPPET: example not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2/core/src/main/java/org/apache/struts2/components/If/java.java;hb=HEAD
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/include-tag.html b/content/tag-developers/include-tag.html
index 08bdb06..98ceb62 100644
--- a/content/tag-developers/include-tag.html
+++ b/content/tag-developers/include-tag.html
@@ -140,8 +140,13 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Include</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Include a servlet's output (result of servlet or a JSP page).&lt;/p&gt;
+ &lt;p&gt;Note: Any additional params supplied to the included page are &lt;b&gt;not&lt;/b&gt;
+ accessible within the rendered page through the &amp;lt;s:property...&amp;gt; tag
+ since no valuestack will be created. You can, however, access them in a
+ servlet via the HttpServletRequest object or from a JSP page via
+ a scriptlet.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>(!) How To access parameters</strong></p>
@@ -164,18 +169,41 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/include.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/include/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Example</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=java|javadoc=true|url=org.apache.struts2.components.Include</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ &amp;lt;-- One: --&amp;gt;
+ &amp;lt;s:include value="myJsp.jsp" /&amp;gt;
+
+ &amp;lt;-- Two: --&amp;gt;
+ &amp;lt;s:include value="myJsp.jsp"&amp;gt;
+    &amp;lt;s:param name="param1" value="value2" /&amp;gt;
+    &amp;lt;s:param name="param2" value="value2" /&amp;gt;
+ &amp;lt;/s:include&amp;gt;
+
+ &amp;lt;-- Three: --&amp;gt;
+ &amp;lt;s:include value="myJsp.jsp"&amp;gt;
+    &amp;lt;s:param name="param1"&amp;gt;value1&amp;lt;/s:param&amp;gt;
+    &amp;lt;s:param name="param2"&amp;gt;value2&amp;lt;/s:param&amp;gt;
+ &amp;lt;/s:include&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exampledescription|lang=none|javadoc=true|url=org.apache.struts2.components.Include</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+ Example one - do an include myJsp.jsp page
+ Example two - do an include to myJsp.jsp page with parameters param1=value1 and param2=value2
+ Example three - do an include to myJsp.jsp page with parameters param1=value1 and param2=value2
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/inputtransferselect-tag.html b/content/tag-developers/inputtransferselect-tag.html
index a2748cb..cec092c 100644
--- a/content/tag-developers/inputtransferselect-tag.html
+++ b/content/tag-developers/inputtransferselect-tag.html
@@ -131,30 +131,43 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.InputTransferSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Create a input transfer select component which is basically an text input
+ and  &amp;lt;select ...&amp;gt; tag with buttons in the middle of them allowing text
+ to be added to the transfer select. Will auto-select all its
+ elements upon its containing form submission.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=notice</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.InputTransferSelect}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ NOTE: The id and doubleId need not be supplied as they will generated provided
+ that the inputtransferselect tag is being used in a form tag. The generated id
+ and doubleId will be &lt;form_id&gt;_&lt;inputtransferselect_doubleName&gt; and
+ &lt;form_id&gt;_&lt;inputtransferselect_doubleName&gt; respectively.
+ </p>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/inputtransferselect.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/inputtransferselect/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Example</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.InputTransferSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;-- minimum configuration --&amp;gt;
+ &amp;lt;s:inputtransferselect
+      label="Favourite Cartoons Characters"
+      name="cartoons"
+      list="{'Popeye', 'He-Man', 'Spiderman'}"
+  /&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/iterator-tag.html b/content/tag-developers/iterator-tag.html
index a8aa427..0929920 100644
--- a/content/tag-developers/iterator-tag.html
+++ b/content/tag-developers/iterator-tag.html
@@ -155,72 +155,186 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;Iterator will iterate over a value. An iterable value can be any of: java.util.Collection, java.util.Iterator,
+ java.util.Enumeration, java.util.Map, or an array.&lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/iterator.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/iterator/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1description|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;The following example retrieves the value of the getDays() method of the current object on the value stack and
+ uses it to iterate over. The &amp;lt;s:property/&amp;gt; tag prints out the current value of the iterator.&lt;/p&gt;
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1code|lang=xml|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:iterator value="days"&amp;gt;
+   &amp;lt;p&amp;gt;day is: &amp;lt;s:property/&amp;gt;&amp;lt;/p&amp;gt;
+ &amp;lt;/s:iterator&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2description|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;The following example uses a {@link Bean} tag and places it into the ActionContext. The iterator tag will retrieve
+ that object from the ActionContext and then calls its getDays() method as above. The status attribute is also used to
+ create an {@link IteratorStatus} object, which in this example, its odd() method is used to alternate row
+ colours:&lt;/p&gt;
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2code|lang=xml|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;s:bean name="org.apache.struts2.example.IteratorExample" var="it"&amp;gt;
+   &amp;lt;s:param name="day" value="'foo'"/&amp;gt;
+   &amp;lt;s:param name="day" value="'bar'"/&amp;gt;
+ &amp;lt;/s:bean&amp;gt;
+
+ &amp;lt;table border="0" cellspacing="0" cellpadding="1"&amp;gt;
+ &amp;lt;tr&amp;gt;
+   &amp;lt;th&amp;gt;Days of the week&amp;lt;/th&amp;gt;
+ &amp;lt;/tr&amp;gt;
+
+ &amp;lt;s:iterator value="#it.days" status="rowstatus"&amp;gt;
+   &amp;lt;tr&amp;gt;
+     &amp;lt;s:if test="#rowstatus.odd == true"&amp;gt;
+       &amp;lt;td style="background: grey"&amp;gt;&amp;lt;s:property/&amp;gt;&amp;lt;/td&amp;gt;
+     &amp;lt;/s:if&amp;gt;
+     &amp;lt;s:else&amp;gt;
+       &amp;lt;td&amp;gt;&amp;lt;s:property/&amp;gt;&amp;lt;/td&amp;gt;
+     &amp;lt;/s:else&amp;gt;
+   &amp;lt;/tr&amp;gt;
+ &amp;lt;/s:iterator&amp;gt;
+ &amp;lt;/table&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3description|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: example3description not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/org/apache/struts2/components/IteratorComponent.java;hb=HEAD
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3code|lang=xml|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+  &amp;lt;s:iterator value="groupDao.groups" status="groupStatus"&amp;gt;
+      &amp;lt;tr class="&amp;lt;s:if test="#groupStatus.odd == true "&amp;gt;odd&amp;lt;/s:if&amp;gt;&amp;lt;s:else&amp;gt;even&amp;lt;/s:else&amp;gt;"&amp;gt;
+          &amp;lt;td&amp;gt;&amp;lt;s:property value="name" /&amp;gt;&amp;lt;/td&amp;gt;
+          &amp;lt;td&amp;gt;&amp;lt;s:property value="description" /&amp;gt;&amp;lt;/td&amp;gt;
+          &amp;lt;td&amp;gt;
+              &amp;lt;s:iterator value="users" status="userStatus"&amp;gt;
+                  &amp;lt;s:property value="fullName" /&amp;gt;&amp;lt;s:if test="!#userStatus.last"&amp;gt;,&amp;lt;/s:if&amp;gt;
+              &amp;lt;/s:iterator&amp;gt;
+          &amp;lt;/td&amp;gt;
+      &amp;lt;/tr&amp;gt;
+  &amp;lt;/s:iterator&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example4description|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt; The next example iterates over a an action collection and passes every iterator value to another action. The
+ trick here lies in the use of the '[0]' operator. It takes the current iterator value and passes it on to the edit
+ action. Using the '[0]' operator has the same effect as using &amp;lt;s:property /&amp;gt;. (The latter, however, does not
+ work from inside the param tag). &lt;/p&gt;
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example4code|lang=xml|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+      &amp;lt;s:action name="entries" var="entries"/&amp;gt;
+      &amp;lt;s:iterator value="#entries.entries" &amp;gt;
+          &amp;lt;s:property value="name" /&amp;gt;
+          &amp;lt;s:property /&amp;gt;
+          &amp;lt;s:push value="..."&amp;gt;
+              &amp;lt;s:action name="edit" var="edit" &amp;gt;
+                  &amp;lt;s:param name="entry" value="[0]" /&amp;gt;
+              &amp;lt;/s:action&amp;gt;
+          &amp;lt;/push&amp;gt;
+      &amp;lt;/s:iterator&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example5description|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;A loop that iterates 5 times&lt;/p&gt;
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example5code|lang=xml|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;s:iterator var="counter" begin="1" end="5" &amp;gt;
+    &amp;lt;!-- current iteration value (1, ... 5) --&amp;gt;
+    &amp;lt;s:property value="top" /&amp;gt;
+ &amp;lt;/s:iterator&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example6description|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;Another way to create a simple loop, similar to JSTL's
+ &amp;lt;c:forEach begin="..." end="..." ...&amp;gt; is to use some 
+ OGNL magic, which provides some under-the-covers magic to 
+ make 0-n loops trivial. This example also loops five times.&lt;/p&gt;
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example6code|lang=xml|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;s:iterator status="stat" value="(5).{ #this }" &amp;gt;
+    &amp;lt;s:property value="#stat.count" /&amp;gt; &amp;lt;!-- Note that "count" is 1-based, "index" is 0-based. --&amp;gt;
+ &amp;lt;/s:iterator&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example7description|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;A loop that iterates over a partial list&lt;/p&gt;
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example7code|lang=xml|javadoc=true|url=org.apache.struts2.components.IteratorComponent</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;s:iterator value="{1,2,3,4,5}" begin="2" end="4" &amp;gt;
+    &amp;lt;!-- current iteration value (2,3,4) --&amp;gt;
+    &amp;lt;s:property value="top" /&amp;gt;
+ &amp;lt;/s:iterator&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/label-tag.html b/content/tag-developers/label-tag.html
index 5175d94..8840489 100644
--- a/content/tag-developers/label-tag.html
+++ b/content/tag-developers/label-tag.html
@@ -140,24 +140,35 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Label</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Renders an HTML LABEL that will allow you to output label:name combination that has the same format treatment as
+ the rest of your UI controls.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/label.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/label/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Label</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:label key="userName" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exdescription|lang=none|javadoc=true|url=org.apache.struts2.components.Label</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+ &lt;p&gt;In this example, a label is rendered. The label is retrieved from a ResourceBundle via the key attribute
+ giving you an output of 'User Name: Ford.Prefect'. Assuming that i18n message userName corresponds
+ to 'User Name' and the action's getUserName() method returns 'Ford.Prefect'&lt;/p&gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/merge-tag.html b/content/tag-developers/merge-tag.html
index 39551d6..dfc8905 100644
--- a/content/tag-developers/merge-tag.html
+++ b/content/tag-developers/merge-tag.html
@@ -140,24 +140,97 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.MergeIterator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Component for MergeIteratorTag, which job is to merge iterators and successive
+ call to the merged iterator will cause each merge iterator to have a chance to
+ expose its element, subsequently next call will allow the next iterator to expose
+ its element. Once the last iterator is done exposing its element, the first iterator
+ is allowed to do so again (unless it is exhausted of entries).&lt;/P&gt;
+
+ &lt;p&gt;Internally the task are delegated to MergeIteratorFilter&lt;/p&gt;
+
+ &lt;p&gt;Example if there are 3 lists being merged, each list have 3 entries, the following will
+ be the logic.&lt;/P&gt;
+ &lt;ol&gt;
+      &lt;li&gt;Display first element of the first list&lt;/li&gt;
+      &lt;li&gt;Display first element of the second list&lt;/li&gt;
+      &lt;li&gt;Display first element of the third list&lt;/li&gt;
+      &lt;li&gt;Display second element of the first list&lt;/li&gt;
+      &lt;li&gt;Display second element of the second list&lt;/li&gt;
+      &lt;li&gt;Display second element of the third list&lt;/li&gt;
+      &lt;li&gt;Display third element of the first list&lt;/li&gt;
+      &lt;li&gt;Display thrid element of the second list&lt;/li&gt;
+      &lt;li&gt;Display third element of the thrid list&lt;/li&gt;
+ &lt;/ol&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/merge.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/merge/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javacode|lang=java|javadoc=true|url=org.apache.struts2.components.MergeIterator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ public class MergeIteratorTagAction extends ActionSupport {
+
+  private List myList1;
+  private List myList2;
+  private List myList3;
+
+  public List getMyList1() {
+      return myList1;
+  }
+
+  public List getMyList2() {
+      return myList2;
+  }
+
+  public List getMyList3() {
+      return myList3;
+  }
+
+
+  public String execute() throws Exception {
+
+      myList1 = new ArrayList();
+      myList1.add("1");
+      myList1.add("2");
+      myList1.add("3");
+
+      myList2 = new ArrayList();
+      myList2.add("a");
+      myList2.add("b");
+      myList2.add("c");
+
+      myList3 = new ArrayList();
+      myList3.add("A");
+      myList3.add("B");
+      myList3.add("C");
+
+      return "done";
+  }
+ }
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.MergeIterator</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:merge var="myMergedIterator1"&amp;gt;
+      &amp;lt;s:param value="%{myList1}" /&amp;gt;
+      &amp;lt;s:param value="%{myList2}" /&amp;gt;
+      &amp;lt;s:param value="%{myList3}" /&amp;gt;
+ &amp;lt;/s:merge&amp;gt;
+ &amp;lt;s:iterator value="%{#myMergedIterator1}"&amp;gt;
+      &amp;lt;s:property /&amp;gt;
+ &amp;lt;/s:iterator&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/optgroup-tag.html b/content/tag-developers/optgroup-tag.html
index c9ef6e3..8e34648 100644
--- a/content/tag-developers/optgroup-tag.html
+++ b/content/tag-developers/optgroup-tag.html
@@ -140,30 +140,40 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.OptGroup</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Create a optgroup component which needs to resides within a select tag.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=notice</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.OptGroup}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ This component is to be used within a  Select component.
+ </p>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/optgroup.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/optgroup/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.OptGroup</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;s:select label="My Selection"
+            name="mySelection"
+            value="%{'POPEYE'}"
+            list="%{#{'SUPERMAN':'Superman', 'SPIDERMAN':'spiderman'}}"&amp;gt;
+    &amp;lt;s:optgroup label="Adult"
+                 list="%{#{'SOUTH_PARK':'South Park'}}" /&amp;gt;
+    &amp;lt;s:optgroup label="Japanese"
+                 list="%{#{'POKEMON':'pokemon','DIGIMON':'digimon','SAILORMOON':'Sailormoon'}}" /&amp;gt;
+ &amp;lt;/s:select&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/optiontransferselect-tag.html b/content/tag-developers/optiontransferselect-tag.html
index 0a02866..b8b6612 100644
--- a/content/tag-developers/optiontransferselect-tag.html
+++ b/content/tag-developers/optiontransferselect-tag.html
@@ -138,36 +138,75 @@
   </tbody>
 </table>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=javadoc</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.DoubleListUIBean}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ Note that the doublelistkey and doublelistvalue attribute will default to "key" and "value"
+ respectively only when the doublelist attribute is evaluated to a Map or its descendant.
+ Other thing else, will result in doublelistkey and doublelistvalue to be null and not used.
+ </p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.OptionTransferSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Create a option transfer select component which is basically two &amp;lt;select ...&amp;gt;
+ tag with buttons in the middle of them allowing options in each of the
+ &amp;lt;select ...&amp;gt; to be moved between themselves. Will auto-select all its
+ elements upon its containing form submision.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=notice|javadoc=true|url=org.apache.struts2.components.OptionTransferSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ NOTE: The id and doubleId need not be supplied as they will generated provided
+ that the optiontransferselect tag is being used in a form tag. The generated id
+ and doubleId will be &amp;lt;form_id&amp;gt;_&amp;lt;optiontransferselect_nameame&amp;gt; and
+ &amp;lt;form_id&amp;gt;_&amp;lt;optiontransferselect_doubleName&amp;gt; respectively.
+ &lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/optiontransferselect.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/optiontransferselect/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.OptionTransferSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;-- minimum configuration --&amp;gt;
+ &amp;lt;s:optiontransferselect
+      label="Favourite Cartoons Characters"
+      name="leftSideCartoonCharacters"
+      list="{'Popeye', 'He-Man', 'Spiderman'}"
+      doubleName="rightSideCartoonCharacters"
+      doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}"
+  /&amp;gt;
+
+  &amp;lt;-- possible configuration --&amp;gt;
+  &amp;lt;s:optiontransferselect
+      label="Favourite Cartoons Characters"
+      name="leftSideCartoonCharacters"
+      leftTitle="Left Title"
+      rightTitle="Right Title"
+      list="{'Popeye', 'He-Man', 'Spiderman'}"
+      multiple="true"
+      headerKey="headerKey"
+      headerValue="--- Please Select ---"
+      emptyOption="true"
+      doubleList="{'Superman', 'Mickey Mouse', 'Donald Duck'}"
+      doubleName="rightSideCartoonCharacters"
+      doubleHeaderKey="doubleHeaderKey"
+      doubleHeaderValue="--- Please Select ---"
+      doubleEmptyOption="true"
+      doubleMultiple="true"
+  /&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/param-tag.html b/content/tag-developers/param-tag.html
index 97d330d..c528251 100644
--- a/content/tag-developers/param-tag.html
+++ b/content/tag-developers/param-tag.html
@@ -140,24 +140,79 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Param</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;This tag can be used to parameterize other tags.&lt;br&gt;
+ The include tag and bean tag are examples of such tags.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ The parameters can be added with or without a name as key.
+ If the tag provides a name attribute the parameters are added using the
+ {@link Component#addParameter(String, Object) addParamter} method.
+ For unnamed parameters the Tag must implement the {@link UnnamedParametric} interface defined in
+ this class (e.g. The TextTag does this).
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ This tag has the following two paramters.
+ &lt;/p&gt;
+ &lt;!-- START SNIPPET: params --&gt;
+ &lt;ul&gt;
+      &lt;li&gt;name (String) - the name of the parameter&lt;/li&gt;
+      &lt;li&gt;value (Object) - the value of the parameter&lt;/li&gt;
+      &lt;li&gt;suppressEmptyParameters (boolean) - whether to suppress this parameter if empty&lt;/li&gt;
+ &lt;/ul&gt;
+ &lt;!-- END SNIPPET: params --&gt;
+ &lt;p&gt;
+ &lt;b&gt;Note:&lt;/b&gt;
+ When you declare the param tag, the value can be defined in either a &lt;tt&gt;value&lt;/tt&gt; attribute or
+ as text between the start and end tag. Struts behaves a bit different according to these two situations.
+ This is best illustrated using an example:
+ &lt;br&gt;&amp;lt;param name="color"&amp;gt;blue&amp;lt;/param&amp;gt; &amp;lt;-- (A) --&amp;gt;
+ &lt;br&gt;&amp;lt;param name="color" value="blue"/&amp;gt; &amp;lt;-- (B) --&amp;gt;
+ &lt;br&gt;In the first situation (A) the value would be evaluated to the stack as a &lt;tt&gt;java.lang.String&lt;/tt&gt; object.
+ And in situation (B) the value would be evaluated to the stack as a &lt;tt&gt;java.lang.Object&lt;/tt&gt; object.
+ &lt;br&gt;For more information see &lt;a href="https://issues.apache.org/jira/browse/WW-808"&gt;WW-808&lt;/a&gt;.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/param.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/param/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Param</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &lt;pre&gt;
+ &amp;lt;ui:component&amp;gt;
+  &amp;lt;ui:param name="key"     value="[0]"/&amp;gt;
+  &amp;lt;ui:param name="value"   value="[1]"/&amp;gt;
+  &amp;lt;ui:param name="context" value="[2]"/&amp;gt;
+ &amp;lt;/ui:component&amp;gt;
+ &lt;/pre&gt;
+
+ &lt;p&gt;
+ Whether to suppress empty parameters:
+ &lt;/p&gt;
+
+ &lt;pre&gt;
+ &amp;lt;s:url action="eventAdd"&amp;gt;
+   &amp;lt;s:param name="bean.searchString" value="%{bean.searchString}" /&amp;gt;
+   &amp;lt;s:param name="bean.filter" value="%{bean.filter}" /&amp;gt;
+   &amp;lt;s:param name="bean.pageNum" value="%{pager.pageNumber}" suppressEmptyParameters="true" /&amp;gt;
+ &amp;lt;/s:url&amp;gt;
+ &lt;/pre&gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exampledescription|javadoc=true|url=org.apache.struts2.components.Param</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> where the key will be the identifier and the value the result of an OGNL expression run against the current
+ ValueStack.
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/password-tag.html b/content/tag-developers/password-tag.html
index 6a80a13..ee23543 100644
--- a/content/tag-developers/password-tag.html
+++ b/content/tag-developers/password-tag.html
@@ -140,24 +140,35 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Password</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Render an HTML input tag of type password.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/password.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/password/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exdescription|javadoc=true|lang=none|url=org.apache.struts2.components.Password</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+ &lt;p&gt;
+ In this example, a password control is displayed. For the label, we are calling ActionSupport's getText() to
+ retrieve password label from a resource bundle.
+ &lt;/p&gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=xml|url=org.apache.struts2.components.Password</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:password label="%{text('password')}" name="password" size="10" maxlength="15" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/property-tag.html b/content/tag-developers/property-tag.html
index cd4f42d..0578064 100644
--- a/content/tag-developers/property-tag.html
+++ b/content/tag-developers/property-tag.html
@@ -140,24 +140,44 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Property</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Used to get the property of a &lt;i&gt;value&lt;/i&gt;, which will default to the top of
+ the stack if none is specified.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/property.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/property/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Property</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;s:push value="myBean"&amp;gt;
+     &lt;!-- Example 1: --&gt;
+     &amp;lt;s:property value="myBeanProperty" /&amp;gt;
+
+     &lt;!-- Example 2: --&gt;TextUtils
+     &amp;lt;s:property value="myBeanProperty" default="a default value" /&amp;gt;
+ &amp;lt;/s:push&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exampledescription|lang=none|javadoc=true|url=org.apache.struts2.components.Property</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+ Example 1 prints the result of myBean's getMyBeanProperty() method.
+ Example 2 prints the result of myBean's getMyBeanProperty() method and if it is null, print 'a default value' instead.
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/push-tag.html b/content/tag-developers/push-tag.html
index ee095bd..8479065 100644
--- a/content/tag-developers/push-tag.html
+++ b/content/tag-developers/push-tag.html
@@ -140,48 +140,102 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Push</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Push value on stack for simplified usage.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/push.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/push/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=org.apache.struts2.components.Push</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:push value="user"&amp;gt;
+     &amp;lt;s:propery value="firstName" /&amp;gt;
+     &amp;lt;s:propery value="lastName" /&amp;gt;
+ &amp;lt;/s:push&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1description|lang=none|javadoc=true|url=org.apache.struts2.components.Push</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+ Pushed user into the stack, and hence property tag could access user's properties
+ (firstName, lastName etc) since user is now at the top of the stack
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=org.apache.struts2.components.Push</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+  &amp;lt;s:push value="myObject"&amp;gt;                              ----- (1)
+       &amp;lt;s:bean name="jp.SomeBean" var="myBean"/&amp;gt;        ----- (2)
+          &amp;lt;s:param name="myParam" value="top"/&amp;gt;        ----- (3)
+       &amp;lt;/s:bean&amp;gt;
+   &amp;lt;/s:push&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2description|lang=none|javadoc=true|url=org.apache.struts2.components.Push</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+ when in (1), myObject is at the top of the stack
+ when in (2), jp.SomeBean is in the top of stack, also in stack's context with key myBean
+ when in (3), top will get the jp.SomeBean instance
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=org.apache.struts2.components.Push</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:push value="myObject"&amp;gt;                                       ---(A)
+    &amp;lt;s:bean name="jp.SomeBean" var="myBean"/&amp;gt;                   ---(B)
+       &amp;lt;s:param name="myParam" value="top.mySomeOtherValue"/&amp;gt;  ---(C)
+    &amp;lt;/s:bean&amp;gt;
+ &amp;lt;/s:push&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3description|lang=none|javadoc=true|url=org.apache.struts2.components.Push</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+ when in (A), myObject is at the top of the stack
+ when in (B), jp.SomeBean is at the top of the stack, also in context with key myBean
+ when in (C), top refers to jp.SomeBean instance. so top.mySomeOtherValue would invoke SomeBean's mySomeOtherValue() method
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example4|lang=xml|javadoc=true|url=org.apache.struts2.components.Push</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:push value="myObject"&amp;gt;                                 ---- (i)
+    &amp;lt;s:bean name="jp.SomeBean" var="myBean"/&amp;gt;             ---- (ii)
+       &amp;lt;s:param name="myParam" value="[1].top"/&amp;gt;         -----(iii)
+    &amp;lt;/s:bean&amp;gt;
+ &amp;lt;/s:push&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example4description|lang=none|javadoc=true|url=org.apache.struts2.components.Push</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+ when in (i), myObject is at the top of the stack
+ when in (ii), jp.SomeBean is at the top of the stack, followed by myObject
+ when in (iii), [1].top will returned top of the cut of stack starting from myObject, namely myObject itself
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/radio-tag.html b/content/tag-developers/radio-tag.html
index 6f2ab7f..5a01466 100644
--- a/content/tag-developers/radio-tag.html
+++ b/content/tag-developers/radio-tag.html
@@ -138,40 +138,49 @@
   </tbody>
 </table>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=javadoc</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.ListUIBean}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ Note that the listkey and listvalue attribute will default to "key" and "value"
+ respectively only when the list attribute is evaluated to a Map or its descendant.
+ Everything else will result in listkey and listvalue to be null and not used.
+ </p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Radio</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Render a radio button input field.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/radio.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/radio/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exdescription|javadoc=true|url=org.apache.struts2.components.Radio</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> In this example, a radio control is displayed with a list of genders. The gender list is built from attribute
+ id=genders. The framework calls getGenders() which will return a Map. For examples using listKey and listValue attributes,
+ see the section select tag. The default selected one will be determined (in this case) by the getMale() method
+ in the action class which should return a value similar to the key of the getGenders() map if that particular
+ gender is to be selected.
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=xml|url=org.apache.struts2.components.Radio</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:action name="GenderMap" var="genders"/&amp;gt;
+ &amp;lt;s:radio label="Gender" name="male" list="#genders.genders"/&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example_fmt|javadoc=true|lang=xml|url=org.apache.struts2.components.Radio</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;@s.radio name="car" list={"ford": "Ford Motor Co", "toyota": "Toyota"} listKey="key" listValue="value" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/reset-tag.html b/content/tag-developers/reset-tag.html
index e247692..abd4c58 100644
--- a/content/tag-developers/reset-tag.html
+++ b/content/tag-developers/reset-tag.html
@@ -140,28 +140,44 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Reset</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Render a reset button. The reset tag is used together with the form tag to provide form resetting.
+ The reset can have two different types of rendering:
+ &lt;ul&gt;
+ &lt;li&gt;input: renders as html &amp;lt;input type="reset"...&amp;gt;&lt;/li&gt;
+ &lt;li&gt;button: renders as html &amp;lt;button type="reset"...&amp;gt;&lt;/li&gt;
+ &lt;/ul&gt;
+ Please note that the button type has advantages by adding the possibility to separate the submitted value from the
+ text shown on the button face, but has issues with Microsoft Internet Explorer at least up to 6.0
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/reset.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/reset/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
 <p><strong>Example 1</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Reset</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:reset value="Reset" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
 <p><strong>Example 2</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=org.apache.struts2.components.Reset</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ Render a reset button:
+ &amp;lt;s:reset type="button" key="reset"/&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/select-tag.html b/content/tag-developers/select-tag.html
index feff66f..4bb28e8 100644
--- a/content/tag-developers/select-tag.html
+++ b/content/tag-developers/select-tag.html
@@ -140,24 +140,63 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Select</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ Render an HTML input tag of type select.
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/select.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/select/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exnote|javadoc=true|lang=none|url=org.apache.struts2.components.Select</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+
+ Note: For any of the tags that use lists (select probably being the most ubiquitous), which uses the OGNL list
+ notation (see the "months" example above), it should be noted that the map key created (in the months example,
+ the '01', '02', etc.) is typed. '1' is a char, '01' is a String, "1" is a String. This is important since if
+ the value returned by your "value" attribute is NOT the same type as the key in the "list" attribute, they
+ WILL NOT MATCH, even though their String values may be equivalent. If they don't match, nothing in your list
+ will be auto-selected.
+
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=xml|url=org.apache.struts2.components.Select</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;s:select label="Pets"
+        name="petIds"
+        list="petDao.pets"
+        listKey="id"
+        listValue="name"
+        multiple="true"
+        size="3"
+        required="true"
+        value="%{petDao.pets.{id}}"
+ /&amp;gt;
+
+ &amp;lt;s:select label="Months"
+        name="months"
+        headerKey="-1" headerValue="Select Month"
+        list="#{'01':'Jan', '02':'Feb', [...]}"
+        value="selectedMonth"
+        required="true"
+ /&amp;gt;
+
+ // The month id (01, 02, ...) returned by the getSelectedMonth() call
+ // against the stack will be auto-selected
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/set-tag.html b/content/tag-developers/set-tag.html
index 277c79d..ea49618 100644
--- a/content/tag-developers/set-tag.html
+++ b/content/tag-developers/set-tag.html
@@ -140,20 +140,47 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Set</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;The set tag assigns a value to a variable in a specified scope. It is useful when you wish to assign a variable to a
+ complex expression and then simply reference that variable each time rather than the complex expression. This is
+ useful in both cases: when the complex expression takes time (performance improvement) or is hard to read (code
+ readability improvement).&lt;/p&gt;
+ &lt;p&gt;If the tag is used with body content, the evaluation of the value parameter is omitted. Instead, the String to
+ which the body evaluates is set as value for the scoped variable.&lt;/p&gt;
+
+ &lt;p&gt;The scopes available are as follows:&lt;/p&gt;
+ &lt;ul&gt;
+   &lt;li&gt;application - the value will be set in application scope according to servlet spec. using the name as its key&lt;/li&gt;
+   &lt;li&gt;session - the value will be set in session scope according to servlet spec. using the name as key &lt;/li&gt;
+   &lt;li&gt;request - the value will be set in request scope according to servlet spec. using the name as key &lt;/li&gt;
+   &lt;li&gt;page - the value will be set in page scope according to servlet spec. using the name as key&lt;/li&gt;
+   &lt;li&gt;action - the value will be set in the request scope and Struts' action context using the name as key&lt;/li&gt;
+ &lt;/ul&gt;
+
+ &lt;p&gt;
+ NOTE:&lt;br&gt;
+ If no scope is specified, it will default to action scope.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/set.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/set/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Set</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:set var="personName" value="person.name"/&amp;gt;
+ Hello, &amp;lt;s:property value="#personName"/&amp;gt;
+
+ &amp;lt;s:set var="janesName"&amp;gt;Jane Doe&amp;lt;/s:set&amp;gt;
+ &amp;lt;s:property value="#janesName"/&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/sort-tag.html b/content/tag-developers/sort-tag.html
index 0984a71..2554209 100644
--- a/content/tag-developers/sort-tag.html
+++ b/content/tag-developers/sort-tag.html
@@ -140,20 +140,49 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.views.jsp.iterator.SortIteratorTag</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;b&gt;NOTE: JSP-TAG&lt;/b&gt;
+
+ &lt;p&gt;A Tag that sorts a List using a Comparator both passed in as the tag attribute.
+ If 'var' attribute is specified, the sorted list will be placed into the PageContext
+ attribute using the key specified by 'var'. The sorted list will ALWAYS be
+ pushed into the stack and poped at the end of this tag.&lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|url=struts2-tags/sort.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/sort/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.views.jsp.iterator.SortIteratorTag</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ USAGE 1:
+ &amp;lt;s:sort comparator="myComparator" source="myList"&amp;gt;
+      &amp;lt;s:iterator&amp;gt;
+      &amp;lt;!-- do something with each sorted elements --&amp;gt;
+      &amp;lt;s:property value="..." /&amp;gt;
+      &amp;lt;/s:iterator&amp;gt;
+ &amp;lt;/s:sort&amp;gt;
+
+ USAGE 2:
+ &amp;lt;s:sort var="mySortedList" comparator="myComparator" source="myList" /&amp;gt;
+
+ &amp;lt;%
+    Iterator sortedIterator = (Iterator) pageContext.getAttribute("mySortedList");
+    for (Iterator i = sortedIterator; i.hasNext(); ) {
+      // do something with each of the sorted elements
+    }
+ %&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/submit-tag.html b/content/tag-developers/submit-tag.html
index da10a65..209708d 100644
--- a/content/tag-developers/submit-tag.html
+++ b/content/tag-developers/submit-tag.html
@@ -140,8 +140,16 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Submit</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> Render a submit button. The submit tag is used together with the form tag to provide asynchronous form submissions.
+ The submit can have three different types of rendering:
+ &lt;ul&gt;
+ &lt;li&gt;input: renders as html &amp;lt;input type="submit"...&amp;gt;&lt;/li&gt;
+ &lt;li&gt;image: renders as html &amp;lt;input type="image"...&amp;gt;&lt;/li&gt;
+ &lt;li&gt;button: renders as html &amp;lt;button type="submit"...&amp;gt;&lt;/li&gt;
+ &lt;/ul&gt;
+ Please note that the button type has advantages by adding the possibility to seperate the submitted value from the
+ text shown on the button face, but has issues with Microsoft Internet Explorer at least up to 6.0
+</code></pre>
 </div>
 
 <table>
@@ -170,8 +178,8 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/submit.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/submit/html.java;hb=HEAD
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/subset-tag.html b/content/tag-developers/subset-tag.html
index 397f0e5..5b90f3f 100644
--- a/content/tag-developers/subset-tag.html
+++ b/content/tag-developers/subset-tag.html
@@ -131,40 +131,123 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.views.jsp.iterator.SubsetIteratorTag</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;b&gt;NOTE: JSP-TAG&lt;/b&gt;
+
+ &lt;p&gt;A tag that takes an iterator and outputs a subset of it. It delegates to
+ {@link org.apache.struts2.util.SubsetIteratorFilter} internally to
+ perform the subset functionality.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/subset.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/subset/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=action|lang=java|javadoc=true|url=org.apache.struts2.views.jsp.iterator.SubsetIteratorTag</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```java
+ public class MySubsetTagAction extends ActionSupport {
+      public String execute() throws Exception {
+         l = new ArrayList();
+         l.add(new Integer(1));
+         l.add(new Integer(2));
+         l.add(new Integer(3));
+         l.add(new Integer(4));
+         l.add(new Integer(5));
+         return "done";
+      }
+
+
+      public Integer[] getMyArray() {
+         return a;
+      }
+
+      public List getMyList() {
+         return l;
+       }
+
+      public Decider getMyDecider() {
+      return new Decider() {
+          public boolean decide(Object element) throws Exception {
+              int i = ((Integer)element).intValue();
+              return (((i % 2) == 0)?true:false);
+          }
+      };
+      }
+  }
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example1|lang=xml|javadoc=true|url=org.apache.struts2.views.jsp.iterator.SubsetIteratorTag</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;!-- s: List basic --&amp;gt;
+    &amp;lt;s:subset source="myList"&amp;gt;
+       &amp;lt;s:iterator&amp;gt;
+          &amp;lt;s:property /&amp;gt;
+       &amp;lt;/s:iterator&amp;gt;
+    &amp;lt;/s:subset&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example2|lang=xml|javadoc=true|url=org.apache.struts2.views.jsp.iterator.SubsetIteratorTag</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;!-- B: List with count --&amp;gt;
+    &amp;lt;s:subset source="myList" count="3"&amp;gt;
+       &amp;lt;s:iterator&amp;gt;
+           &amp;lt;s:property /&amp;gt;
+       &amp;lt;/s:iterator&amp;gt;
+     &amp;lt;/s:subset&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example3|lang=xml|javadoc=true|url=org.apache.struts2.views.jsp.iterator.SubsetIteratorTag</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;!--  C: List with start --&amp;gt;
+      &amp;lt;s:subset source="myList" count="13" start="3"&amp;gt;
+         &amp;lt;s:iterator&amp;gt;
+           &amp;lt;s:property /&amp;gt;
+         &amp;lt;/s:iterator&amp;gt;
+      &amp;lt;/s:subset&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example4|lang=xml|javadoc=true|url=org.apache.struts2.views.jsp.iterator.SubsetIteratorTag</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;!--  D: List with var --&amp;gt;
+      &amp;lt;s:subset var="mySubset" source="myList" count="13" start="3" /&amp;gt;
+      &amp;lt;%
+          Iterator i = (Iterator) pageContext.getAttribute("mySubset");
+          while(i.hasNext()) {
+      %&amp;gt;
+      &amp;lt;%=i.next() %&amp;gt;
+      &amp;lt;%  } %&amp;gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example5|lang=xml|javadoc=true|url=org.apache.struts2.views.jsp.iterator.SubsetIteratorTag</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+  &amp;lt;!--  D: List with Decider --&amp;gt;
+      &amp;lt;s:subset source="myList" decider="myDecider"&amp;gt;
+             &amp;lt;s:iterator&amp;gt;
+                  &amp;lt;s:property /&amp;gt;
+             &amp;lt;/s:iterator&amp;gt;
+      &amp;lt;/s:subset&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/text-tag.html b/content/tag-developers/text-tag.html
index 1b408d2..3761abd 100644
--- a/content/tag-developers/text-tag.html
+++ b/content/tag-developers/text-tag.html
@@ -140,26 +140,64 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Text</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Render a I18n text message.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ The message must be in a resource bundle
+ with the same name as the action that it is associated with. In practice
+ this means that you should create a properties file in the same package
+ as your Java class with the same name as your class, but with .properties
+ extension.
+ &lt;/p&gt;
+
+ &lt;p&gt;
+ If the named message is not found in a property file, then the body of the
+ tag will be used as default message. If no body is used, then the stack can
+ be searched, and if a value is returned, it will written to the output.
+ If no value is found on the stack, the key of the message will be written out.
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p>For more details on using resource bundles with Struts 2 read the <em>localization guide</em> .</p>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/text.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/text/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exdescription|lang=none|javadoc=true|url=org.apache.struts2.components.Text</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+ &lt;p&gt;Accessing messages from a given bundle (the i18n Shop example bundle in the first example) and using bundle defined through the framework in the second example.&lt;/p&gt;
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Text</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;!-- First Example --&amp;gt;
+ &amp;lt;s:i18n name="struts.action.test.i18n.Shop"&amp;gt;
+     &amp;lt;s:text name="main.title"/&amp;gt;
+ &amp;lt;/s:i18n&amp;gt;
+
+ &amp;lt;!-- Second Example --&amp;gt;
+ &amp;lt;s:text name="main.title" /&amp;gt;
+
+ &amp;lt;!-- Third Examlpe --&amp;gt;
+ &amp;lt;s:text name="i18n.label.greetings"&amp;gt;
+    &amp;lt;s:param &amp;gt;Mr Smith&amp;lt;/s:param&amp;gt;
+ &amp;lt;/s:text&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
 <p>Other example</p>
diff --git a/content/tag-developers/textarea-tag.html b/content/tag-developers/textarea-tag.html
index b934801..5e81123 100644
--- a/content/tag-developers/textarea-tag.html
+++ b/content/tag-developers/textarea-tag.html
@@ -140,20 +140,24 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.TextArea</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Render HTML textarea tag.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/textarea.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/textarea/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Example</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.TextArea</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:textarea label="Comments" name="comments" cols="30" rows="8"/&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/textfield-tag.html b/content/tag-developers/textfield-tag.html
index f05966f..b88b340 100644
--- a/content/tag-developers/textfield-tag.html
+++ b/content/tag-developers/textfield-tag.html
@@ -140,24 +140,32 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.TextField</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Render an HTML input field of type text&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/textfield.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/textfield/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=exdescription|lang=none|javadoc=true|url=org.apache.struts2.components.TextField</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```none
+ In this example, a text control for the "user" property is rendered. The label is also retrieved from a ResourceBundle via the key attribute.
+```
+
+</code></pre>
 </div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.TextField</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:textfield key="user" /&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/token-tag.html b/content/tag-developers/token-tag.html
index 74de20e..b2004be 100644
--- a/content/tag-developers/token-tag.html
+++ b/content/tag-developers/token-tag.html
@@ -140,20 +140,29 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Token</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;Stop double-submission of forms.&lt;/p&gt;
+
+ &lt;p&gt;
+ The token tag is used to help with the "double click" submission problem. It is needed if you are using the
+ TokenInterceptor or the TokenSessionInterceptor. The s:token tag merely places a hidden element that contains
+ the unique token.&lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/token.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/token/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|javadoc=true|lang=xml|url=org.apache.struts2.components.Token</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+ &amp;lt;s:token /&amp;gt;
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/updownselect-tag.html b/content/tag-developers/updownselect-tag.html
index 8e1e6b7..f2568da 100644
--- a/content/tag-developers/updownselect-tag.html
+++ b/content/tag-developers/updownselect-tag.html
@@ -138,32 +138,58 @@
   </tbody>
 </table>
 
-<table>
-  <tbody>
-    <tr>
-      <td>{snippet:id=javadoc</td>
-      <td>javadoc=true</td>
-      <td>url=org.apache.struts2.components.ListUIBean}</td>
-    </tr>
-  </tbody>
-</table>
+<p>
+ Note that the listkey and listvalue attribute will default to "key" and "value"
+ respectively only when the list attribute is evaluated to a Map or its descendant.
+ Everything else will result in listkey and listvalue to be null and not used.
+ </p>
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.UpDownSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code> &lt;p&gt;
+ Create a Select component with buttons to move the elements in the select component
+ up and down. When the containing form is submited, its elements will be submitted in
+ the order they are arranged (top to bottom).
+ &lt;/p&gt;
+</code></pre>
 </div>
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/updownselect.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/updownselect/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.UpDownSelect</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;!-- Example 1: simple example --&amp;gt;
+ &amp;lt;s:updownselect
+ list="#{'england':'England', 'america':'America', 'germany':'Germany'}"
+ name="prioritisedFavouriteCountries"
+ headerKey="-1"
+ headerValue="--- Please Order Them Accordingly ---"
+ emptyOption="true" /&amp;gt;
+
+ &amp;lt;!-- Example 2: more complex example --&amp;gt;
+ &amp;lt;s:updownselect
+ list="defaultFavouriteCartoonCharacters"
+ name="prioritisedFavouriteCartoonCharacters"
+ headerKey="-1"
+ headerValue="--- Please Order ---"
+ emptyOption="true"
+ allowMoveUp="true"
+ allowMoveDown="true"
+ allowSelectAll="true"
+ moveUpLabel="Move Up"
+ moveDownLabel="Move Down"
+ selectAllLabel="Select All" /&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>
diff --git a/content/tag-developers/url-tag.html b/content/tag-developers/url-tag.html
index aca13cb..7d7cee2 100644
--- a/content/tag-developers/url-tag.html
+++ b/content/tag-developers/url-tag.html
@@ -149,8 +149,28 @@
 
 <p><strong>Description</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.URL</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+ &lt;p&gt;This tag is used to create a URL.&lt;/p&gt;
+
+ &lt;p&gt;You can use the &amp;lt;param&amp;gt; tag inside the body to provide
+ additional request parameters. If the value of a param is an Array or
+ an Iterable all the values will be added to the URL.&lt;/p&gt;
+
+ &lt;b&gt;NOTE:&lt;/b&gt;
+ &lt;p&gt;By default request parameters will be separated using escaped ampersands (i.e., &amp;amp;amp;).
+ This is necessary for XHTML compliance, however, when using the URL generated by this tag
+ with the &amp;lt;s:property&amp;gt; tag, the &lt;b&gt;escapeAmp&lt;/b&gt; attribute should be used to disable
+ ampersand escaping.&lt;/p&gt;
+
+ &lt;b&gt;NOTE:&lt;/b&gt;
+ &lt;p&gt;When includeParams is 'all' or 'get', the parameter defined in a &amp;lt;param&amp;gt;
+ tag will take precedence over any params included due to the includeParams attribute. For
+ example, in Example 3 below, if there is a id parameter in the url where the page this
+ tag is included like http://&amp;lt;host&amp;gt;:&amp;lt;port&amp;gt;/&amp;lt;context&amp;gt;/editUser.action?id=3333&amp;amp;name=John
+ the generated url will be http://&amp;lt;host&amp;gt;:&amp;lt;port&amp;gt;/&amp;lt;context&amp;gt;/editUser.action?id=22&amp;amp;name=John
+ because the parameter defined in the param tag will take precedence.&lt;/p&gt;
+
+</code></pre>
 </div>
 
 <p><strong>Setting a default value for includeParams</strong></p>
@@ -189,14 +209,33 @@
 
 <p><strong>Parameters</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=tagattributes|javadoc=false|url=struts2-tags/url.html</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>START SNIPPET: tagattributes not found in https://gitbox.apache.org/repos/asf?p=struts.git;a=blob_plain;f=core/src/main/java/struts2-tags/url/html.java;hb=HEAD
+</code></pre>
 </div>
 
 <p><strong>Examples</strong></p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="err">snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.URL</span><span class="p">}</span><span class="w">
-</span></code></pre>
+<div class="highlighter-rouge"><pre class="highlight"><code>
+```xml
+
+ &amp;lt;-- Example 1 --&amp;gt;
+ &amp;lt;s:url value="editGadget.action"&amp;gt;
+     &amp;lt;s:param name="id" value="%{selected}" /&amp;gt;
+ &amp;lt;/s:url&amp;gt;
+
+ &amp;lt;-- Example 2 --&amp;gt;
+ &amp;lt;s:url action="editGadget"&amp;gt;
+     &amp;lt;s:param name="id" value="%{selected}" /&amp;gt;
+ &amp;lt;/s:url&amp;gt;
+
+ &amp;lt;-- Example 3--&amp;gt;
+ &amp;lt;s:url includeParams="get"&amp;gt;
+     &amp;lt;s:param name="id" value="%{'22'}" /&amp;gt;
+ &amp;lt;/s:url&amp;gt;
+
+```
+
+</code></pre>
 </div>
 
   </section>

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

Mime
View raw message