http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/intrangefieldvalidator-annotation.html
----------------------------------------------------------------------
diff --git a/content/docs/intrangefieldvalidator-annotation.html 
b/content/docs/intrangefieldvalidator-annotation.html
index b1850d4..f01d552 100644
--- a/content/docs/intrangefieldvalidator-annotation.html
+++ b/content/docs/intrangefieldvalidator-annotation.html
@@ -157,7 +157,7 @@ If neither min nor max is set, nothing will be done.</p>
 <h2 id="IntRangeFieldValidatorAnnotation-Examples">Examples</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 @IntRangeFieldValidator(message = &quot;Default message&quot;, key = 
&quot;i18n.key&quot;, shortCircuit = true, min = &quot;0&quot;, max = 
&quot;42&quot;)
 
 @IntRangeFieldValidator(message = &quot;Default message&quot;, key = 
&quot;i18n.key&quot;, shortCircuit = true, minExpression = 
&quot;${minValue}&quot;, maxExpression = &quot;${maxValue}&quot;)

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/iterator.html
----------------------------------------------------------------------
diff --git a/content/docs/iterator.html b/content/docs/iterator.html
index b20289d..83c90e5 100644
--- a/content/docs/iterator.html
+++ b/content/docs/iterator.html
@@ -161,7 +161,7 @@ java.util.Enumeration, java.util.Map, or an array.</p>
 uses it to iterate over. The &lt;s:property/&gt; tag prints out the current 
value of the iterator.</p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 &lt;s:iterator value=&quot;days&quot;&gt;
   &lt;p&gt;day is: &lt;s:property/&gt;&lt;/p&gt;
 &lt;/s:iterator&gt;
@@ -175,7 +175,7 @@ create an IteratorStatus object, which in this example, its 
odd() method is used
 colours:</p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 
 &lt;s:bean name=&quot;org.apache.struts2.example.IteratorExample&quot; 
var=&quot;it&quot;&gt;
   &lt;s:param name=&quot;day&quot; value=&quot;&#39;foo&#39;&quot;/&gt;
@@ -208,7 +208,7 @@ class through OGNL, iterating over groups and their users 
(in a security context
 current object is the last available in the iteration, and if not, we need to 
separate the users using a comma: </p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 
  &lt;s:iterator value=&quot;groupDao.groups&quot; 
status=&quot;groupStatus&quot;&gt;
      &lt;tr class=&quot;&lt;s:if test=&quot;#groupStatus.odd == true 
&quot;&gt;odd&lt;/s:if&gt;&lt;s:else&gt;even&lt;/s:else&gt;&quot;&gt;
@@ -232,7 +232,7 @@ action. Using the '[0]' operator has the same effect as 
using &lt;s:property /&g
 work from inside the param tag). </p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 
      &lt;s:action name=&quot;entries&quot; var=&quot;entries&quot;/&gt;
      &lt;s:iterator value=&quot;#entries.entries&quot; &gt;
@@ -252,7 +252,7 @@ work from inside the param tag). </p>
 <p></p><p>A loop that iterates 5 times</p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 
 &lt;s:iterator var=&quot;counter&quot; begin=&quot;1&quot; end=&quot;5&quot; 
&gt;
    &lt;!-- current iteration value (1, ... 5) --&gt;
@@ -269,7 +269,7 @@ OGNL magic, which provides some under-the-covers magic to
 make 0-n loops trivial. This example also loops five times.</p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 
 &lt;s:iterator status=&quot;stat&quot; value=&quot;(5).{ #this }&quot; &gt;
    &lt;s:property value=&quot;#stat.count&quot; /&gt; &lt;!-- Note that 
&quot;count&quot; is 1-based, &quot;index&quot; is 0-based. --&gt;
@@ -282,7 +282,7 @@ make 0-n loops trivial. This example also loops five 
times.</p>
 <p></p><p>A loop that iterates over a partial list</p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 
 &lt;s:iterator value=&quot;{1,2,3,4,5}&quot; begin=&quot;2&quot; 
end=&quot;4&quot; &gt;
    &lt;!-- current iteration value (2,3,4) --&gt;

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/jasperreports-plugin.html
----------------------------------------------------------------------
diff --git a/content/docs/jasperreports-plugin.html 
b/content/docs/jasperreports-plugin.html
index 0adf568..283397e 100644
--- a/content/docs/jasperreports-plugin.html
+++ b/content/docs/jasperreports-plugin.html
@@ -34,20 +34,6 @@ under the License.
             color:                 #666;
         }
     </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' 
rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' 
rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' 
type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
     <script type="text/javascript" language="javascript">
         var hide = null;
         var show = null;
@@ -139,9 +125,9 @@ under the License.
 
     <div class="pagecontent">
         <div class="wiki-content">
-            <div id="ConfluenceContent"><div 
class="confluence-information-macro 
confluence-information-macro-information"><span class="aui-icon aui-icon-small 
aui-iconfont-info confluence-information-macro-icon"></span><div 
class="confluence-information-macro-body"><p><a shape="rect" 
class="external-link" href="http://jasperforge.org/sf/projects/jasperreports"; 
rel="nofollow">JasperReports</a> is a powerful open source Java (LGPL) 
reporting tool that has the ability to deliver rich content onto the screen, to 
the printer or into PDF, HTML, XLS, CSV and XML files.</p></div></div>
+            <div id="ConfluenceContent"><rich-text-body><p><a shape="rect" 
class="external-link" href="http://jasperforge.org/sf/projects/jasperreports"; 
rel="nofollow">JasperReports</a> is a powerful open source Java (LGPL) 
reporting tool that has the ability to deliver rich content onto the screen, to 
the printer or into PDF, HTML, XLS, CSV and XML files.</p></rich-text-body>
 
-<p>The JasperReports plugin enables Actions to create high-quality reports as 
results.</p>
+<p>The JasperReports plugin <parameter 
ac:name="atlassian-macro-output-type">INLINE</parameter><rich-text-body><p>enables
 Actions to create high-quality reports as results</p></rich-text-body>.</p>
 
 <h2 id="JasperReportsPlugin-Features">Features</h2>
 
@@ -152,65 +138,17 @@ under the License.
 
 <p>To use this plugin, have your packages that contain the target actions 
extend the provided <code>jasperreports-default</code> package, which contains 
the <code>jasper</code> result type.  Then, simply use the result type in the 
desired actions.  The result takes the following parameters:</p>
 
-<p></p><p>
-Generates a JasperReports report using the specified format or PDF if no
-format is specified.
-</p>
-
-
-<p></p><ul></ul><p></p><ul><li><b>location (default)</b> - the location where 
the compiled jasper report
-definition is (foo.jasper), relative from current URL.</li><li><b>dataSource 
(required)</b> - the EL expression used to retrieve the
-datasource from the value stack (usually a List).</li><li><b>parse</b> - true 
by default. If set to false, the location param will
-not be parsed for EL expressions.</li><li><b>format</b> - the format in which 
the report should be generated. Valid
-values can be found in JasperReportConstants. If no format is
-specified, PDF will be used.</li><li><b>contentDisposition</b> - disposition 
(defaults to "inline", values are
-typically <i>filename="document.pdf"</i>).</li><li><b>documentName</b> - name 
of the document (will generate the http header
-<code>Content-disposition = X; 
filename=X.[format]</code>).</li><li><b>delimiter</b> - the delimiter used when 
generating CSV reports. By
-default, the character used is ",".</li><li><b>imageServletUrl</b> - name of 
the url that, when prefixed with the
-context page, can return report images.</li><li>
-<b>reportParameters</b> - (2.1.2+) OGNL expression used to retrieve a map of
-report parameters from the value stack. The parameters may be accessed
-in the report via the usual JR mechanism and might include data not
-part of the dataSource, such as the user name of the report creator, etc.
-</li><li>
-<b>exportParameters</b> - (2.1.2+) OGNL expression used to retrieve a map of
-JR exporter parameters from the value stack. The export parameters are
-used to customize the JR export. For example, a PDF export might enable
-encryption and set the user password to a string known to the report creator.
-</li><li>
-<b>connection</b> - (2.1.7+) JDBC Connection which can be passed to the
-report instead of dataSource
-</li><li><b>wrapField</b> - (2.3.18+) defines if fields should warp with 
ValueStackDataSource
-see https://issues.apache.org/jira/browse/WW-3698 for more details
-</li></ul>
-<p>
-This result follows the same rules from StrutsResultSupport.
-Specifically, all parameters will be parsed if the "parse" parameter
-is not set to false.
-</p>
+<plain-text-body>{snippet:id=description|javadoc=true|url=struts2/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java}</plain-text-body>
+
+<plain-text-body>{snippet:id=params|javadoc=true|url=struts2/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java}</plain-text-body>
 
 <h3 id="JasperReportsPlugin-Examples">Examples</h3>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
-&lt;result name=&quot;success&quot; type=&quot;jasper&quot;&gt;
-  &lt;param name=&quot;location&quot;&gt;foo.jasper&lt;/param&gt;
-  &lt;param name=&quot;dataSource&quot;&gt;mySource&lt;/param&gt;
-  &lt;param name=&quot;format&quot;&gt;CSV&lt;/param&gt;
-&lt;/result&gt;
-]]></script>
-</div></div>
+<plain-text-body>{snippet:id=example1|lang=xml|javadoc=true|url=struts2/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java}</plain-text-body>
 
 <p>or for pdf:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
-&lt;result name=&quot;success&quot; type=&quot;jasper&quot;&gt;
-  &lt;param name=&quot;location&quot;&gt;foo.jasper&lt;/param&gt;
-  &lt;param name=&quot;dataSource&quot;&gt;mySource&lt;/param&gt;
-&lt;/result&gt;
-]]></script>
-</div></div>
+<plain-text-body>{snippet:id=example2|lang=xml|javadoc=true|url=struts2/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java}</plain-text-body>
 
 <h3 id="JasperReportsPlugin-Settings">Settings</h3>
 

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/key-annotation.html
----------------------------------------------------------------------
diff --git a/content/docs/key-annotation.html b/content/docs/key-annotation.html
index 121854a..d354986 100644
--- a/content/docs/key-annotation.html
+++ b/content/docs/key-annotation.html
@@ -152,7 +152,7 @@ under the License.
 <h2 id="KeyAnnotation-Examples">Examples</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 // The key property for User objects within the users collection is the 
&lt;code&gt;userName&lt;/code&gt; attribute.
 @Key( value = java.lang.Long.class )
 private Map&lt;Long, User&gt; userMap;

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/keyproperty-annotation.html
----------------------------------------------------------------------
diff --git a/content/docs/keyproperty-annotation.html 
b/content/docs/keyproperty-annotation.html
index ea19a00..302a66b 100644
--- a/content/docs/keyproperty-annotation.html
+++ b/content/docs/keyproperty-annotation.html
@@ -153,7 +153,7 @@ under the License.
 <h2 id="KeyPropertyAnnotation-Examples">Examples</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 // The key property for User objects within the users collection is the 
&lt;code&gt;userName&lt;/code&gt; attribute.
 @KeyProperty( value = &quot;userName&quot; )
 protected List&lt;User&gt; users = null;

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/label.html
----------------------------------------------------------------------
diff --git a/content/docs/label.html b/content/docs/label.html
index 27b12e0..17dbd42 100644
--- a/content/docs/label.html
+++ b/content/docs/label.html
@@ -153,12 +153,12 @@ the rest of your UI controls.</p>
 <h2 id="label-Examples">Examples</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 &lt;s:label key=&quot;userName&quot; /&gt;
 ]]></script>
 </div></div>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: plain; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: plain; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 &lt;p&gt;In this example, a label is rendered. The label is retrieved from a 
ResourceBundle via the key attribute
 giving you an output of &#39;User Name: Ford.Prefect&#39;. Assuming that i18n 
message userName corresponds
 to &#39;User Name&#39; and the action&#39;s getUserName() method returns 
&#39;Ford.Prefect&#39;&lt;/p&gt;

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/localization.html
----------------------------------------------------------------------
diff --git a/content/docs/localization.html b/content/docs/localization.html
index 11234c3..ee8388f 100644
--- a/content/docs/localization.html
+++ b/content/docs/localization.html
@@ -34,20 +34,6 @@ under the License.
             color:                 #666;
         }
     </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' 
rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' 
rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' 
type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
     <script type="text/javascript" language="javascript">
         var hide = null;
         var show = null;
@@ -139,58 +125,15 @@ under the License.
 
     <div class="pagecontent">
         <div class="wiki-content">
-            <div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1499928261944 {padding: 0px;}
-div.rbtoc1499928261944 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1499928261944 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style></p><div class="toc-macro rbtoc1499928261944">
-<ul class="toc-indentation"><li><a shape="rect" 
href="#Localization-Overview">Overview</a></li><li><a shape="rect" 
href="#Localization-ResourceBundleSearchOrder">Resource Bundle Search Order</a>
-<ul class="toc-indentation"><li><a shape="rect" 
href="#Localization-Defaultaction'sclass">Default action's class</a></li><li><a 
shape="rect" href="#Localization-UsinggetTextfromaTag">Using getText from a 
Tag</a></li><li><a shape="rect" href="#Localization-Usingthetexttag">Using the 
text tag</a></li><li><a shape="rect" href="#Localization-UsingtheI18ntag">Using 
the I18n tag</a></li><li><a shape="rect" 
href="#Localization-UsingtheKeyattributeofUITags">Using the Key attribute of UI 
Tags</a></li></ul>
-</li><li><a shape="rect" href="#Localization-I18nInterceptor">I18n 
Interceptor</a></li><li><a shape="rect" 
href="#Localization-GlobalResources(struts.custom.i18n.resources)instruts.properties">Global
 Resources (struts.custom.i18n.resources) in struts.properties</a></li><li><a 
shape="rect" href="#Localization-FormattingDatesandNumbers">Formatting Dates 
and Numbers</a></li><li><a shape="rect" 
href="#Localization-ComparisonwithStruts1">Comparison with Struts 
1</a></li><li><a shape="rect" href="#Localization-Usingonlyglobalbundles">Using 
only global bundles</a></li><li><a shape="rect" 
href="#Localization-CustomTextProviderandTextProviderFactory">Custom 
TextProvider and TextProviderFactory</a></li><li><a shape="rect" 
href="#Localization-Next:">Next: Type Conversion</a></li></ul>
-</div><h2 id="Localization-Overview">Overview</h2><p>The framework supports 
internationalization (i18n) in the following places:</p><ol><li>the <a 
shape="rect" href="ui-tags.html">UI Tags</a></li><li>Messages and Errors from 
the <a shape="rect" class="external-link" 
href="http://struts.apache.org/2.0.6/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ValidationAware.html";>ValidationAware</a>
 interface (implemented by <a shape="rect" class="external-link" 
href="http://struts.apache.org/2.0.6/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ActionSupport.html";>ActionSupport</a>
 and <a shape="rect" class="external-link" 
href="http://struts.apache.org/2.0.6/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ValidationAwareSupport.html";>ValidationAwareSupport</a>)</li><li>Within
 action classes that extend <a shape="rect" class="external-link" 
href="http://struts.apache.org/2.0.6/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ActionSupport.html";>ActionSupport</
 a> through the getText() method</li></ol><h2 
id="Localization-ResourceBundleSearchOrder">Resource Bundle Search 
Order</h2><p>Resource bundles are searched in the following 
order:</p><ol><li><code>ActionClass</code>.properties</li><li><code>Interface</code>.properties
 (every interface and sub-interface)</li><li><code>BaseClass</code>.properties 
(all the way to Object.properties)</li><li>ModelDriven's model (if implements 
ModelDriven), for the model object repeat from 1</li><li>package.properties (of 
the directory where class is located and every parent directory all the way to 
the root directory)</li><li>search up the i18n message key hierarchy 
itself</li><li>global resource properties</li></ol><p>This is how it is 
implemented in a default implementation of 
the&#160;<code>LocalizedTextProvider</code>&#160;interface. You can provide 
your own implementation using <code>TextProvider</code>&#160;and 
<code>TextProviderFactory</code>&#160;interfaces.</p><div 
class="confluence-information-m
 acro confluence-information-macro-tip"><p class="title">Package 
hierarchy</p><span class="aui-icon aui-icon-small aui-iconfont-approve 
confluence-information-macro-icon"></span><div 
class="confluence-information-macro-body"><p>To clarify #5, while traversing 
the package hierarchy, Struts 2 will look for a file 
package.properties:</p><div class="preformatted panel" style="border-width: 
1px;"><div class="preformattedContent panelContent">
-<pre>com/
+            <div id="ConfluenceContent"><h2 
id="Localization-Overview">Overview</h2><p>The framework supports 
internationalization (i18n) in the following places:</p><ol><li>the <a 
shape="rect" href="ui-tags.html">UI Tags</a></li><li>Messages and Errors from 
the <a shape="rect" class="external-link" 
href="http://struts.apache.org/2.0.6/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ValidationAware.html";>ValidationAware</a>
 interface (implemented by <a shape="rect" class="external-link" 
href="http://struts.apache.org/2.0.6/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ActionSupport.html";>ActionSupport</a>
 and <a shape="rect" class="external-link" 
href="http://struts.apache.org/2.0.6/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ValidationAwareSupport.html";>ValidationAwareSupport</a>)</li><li>Within
 action classes that extend <a shape="rect" class="external-link" 
href="http://struts.apache.org/2.0.6/struts2-core/apidocs/index.html?com/opensymphony/xwork2/A
 ctionSupport.html">ActionSupport</a> through the getText() method</li></ol><h2 
id="Localization-ResourceBundleSearchOrder">Resource Bundle Search 
Order</h2><p>Resource bundles are searched in the following 
order:</p><ol><li><code>ActionClass</code>.properties</li><li><code>Interface</code>.properties
 (every interface and sub-interface)</li><li><code>BaseClass</code>.properties 
(all the way to Object.properties)</li><li>ModelDriven's model (if implements 
ModelDriven), for the model object repeat from 1</li><li>package.properties (of 
the directory where class is located and every parent directory all the way to 
the root directory)</li><li>search up the i18n message key hierarchy 
itself</li><li>global resource properties</li></ol><p>This is how it is 
implemented in a default implementation of 
the&#160;<code>LocalizedTextProvider</code>&#160;interface. You can provide 
your own implementation using <code>TextProvider</code>&#160;and 
<code>TextProviderFactory</code>&#160;interfaces.</p><p
 arameter ac:name="title">Package hierarchy</parameter><rich-text-body><p>To 
clarify #5, while traversing the package hierarchy, Struts 2 will look for a 
file package.properties:</p><plain-text-body>com/
     acme/
         package.properties
         actions/
                 package.properties
                 FooAction.java
-                FooAction.properties</pre>
-</div></div><p>If <code>FooAction</code>.properties does not exist, 
<code>com/acme/action/package.properties</code> will be searched for, if not 
found <code>com/acme/package.properties</code>, if not found 
<code>com/package.properties</code>, etc.</p></div></div><h3 
id="Localization-Defaultaction'sclass">Default action's class</h3><p>If you 
configure action as follow</p><div class="code panel pdl" style="border-width: 
1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" 
style="font-size:12px;">&lt;action name="index"&gt;
+                FooAction.properties</plain-text-body><p>If 
<code>FooAction</code>.properties does not exist, 
<code>com/acme/action/package.properties</code> will be searched for, if not 
found <code>com/acme/package.properties</code>, if not found 
<code>com/package.properties</code>, etc.</p></rich-text-body><h3 
id="Localization-Defaultaction'sclass">Default action's class</h3><p>If you 
configure action as follow</p><parameter 
ac:name="">xml</parameter><plain-text-body>&lt;action name="index"&gt;
    &lt;result&gt;/index.jsp&lt;/result&gt;
-&lt;/action&gt;</pre>
-</div></div><p>it will use a default class defined 
with&#160;<code>default-class-ref</code><span style="color: 
rgb(34,34,34);">&#160;in&#160;<code>struts-default.xml</code> which 
is&#160;<code>com.opensymphony.xwork2.ActionSupport</code>. It means you have 
two options here to get I18N working in that case:</span></p><ul><li><span 
style="color: 
rgb(34,34,34);">define&#160;<code>com/opensymphony/xwork2/ActionSupport.properties</code>
 and put messages there</span></li><li><span style="color: 
rgb(34,34,34);">point&#160;<code>default-class-ref</code> to your base class 
and then defined appropriated <code>.properties</code>&#160;file (corresponding 
to class' name or package)</span></li></ul><p><span style="font-size: 
20.0px;line-height: 1.5;">Examples</span></p><p>There are several ways to 
access the message resources, including <code>getText</code>, the 
<code>text</code> tag, and the <code>i18n</code> tag.</p><h3 
id="Localization-UsinggetTextfromaTag">Using <code>getText</code> from a Ta
 g</h3><p>To display i18n text, use a call to <code>getText</code> in the <a 
shape="rect" href="property.html">property</a> tag, or any other tag, such as 
the UI tags. (The <code>getText</code> technique is especially useful for 
labels of UI tags.)</p><div class="code panel pdl" style="border-width: 
1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
-
-&lt;s:property value=&quot;getText(&#39;some.key&#39;)&quot; /&gt;
-
-]]></script>
-</div></div><div class="confluence-information-macro 
confluence-information-macro-note"><span class="aui-icon aui-icon-small 
aui-iconfont-warning confluence-information-macro-icon"></span><div 
class="confluence-information-macro-body"><p>The default implementation of 
<code>TextProvider</code> which is used in <code>ActionSupport</code> perform 
evaluation of value read from bundle base on the provided key, see <a 
shape="rect" href="localizing-output.html">Localizing Output</a> for an 
example.</p></div></div><h3 id="Localization-Usingthetexttag">Using the 
<code>text</code> tag</h3><p>The <a shape="rect" href="text.html">text</a> tag 
retrieves a message from the default resource bundle.</p><div class="code panel 
pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
-
-&lt;-- Fourth Example --&gt;
-&lt;s:text name=&quot;some.key&quot; /&gt;
-
-&lt;-- Fifth Example --&gt;
-&lt;s:text name=&quot;some.invalid.key&quot; &gt;
-   The Default Message That Will Be Displayed
-&lt;/s:text&gt;
-
-]]></script>
-</div></div><h3 id="Localization-UsingtheI18ntag">Using the <code>I18n</code> 
tag</h3><p>The <a shape="rect" href="i18n.html">i18n</a> tag pushes an 
arbitrary resource bundle on to the value stack. Other tags within the scope of 
the i18n tag can display messages from that resource bundle.</p><div 
class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
-
-&lt;s:i18n name=&quot;some.package.bundle&quot; &gt;
-     &lt;s:text name=&quot;some.key&quot; /&gt;
-&lt;/s:i18n&gt;
-
-]]></script>
-</div></div><div class="confluence-information-macro 
confluence-information-macro-tip"><span class="aui-icon aui-icon-small 
aui-iconfont-approve confluence-information-macro-icon"></span><div 
class="confluence-information-macro-body"><p>Internationalizing SiteMesh 
decorators is possible, but there are quirks. See <a shape="rect" 
href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33343";>SiteMesh
 Plugin</a> for more.</p></div></div><h3 
id="Localization-UsingtheKeyattributeofUITags">Using the Key attribute of UI 
Tags</h3><p>The key attribute of most UI tags can be used to retrieve a message 
from a resource bundle:</p><div class="code panel pdl" style="border-width: 
1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" 
style="font-size:12px;">&lt;s:textfield key="some.key" 
name="textfieldName"/&gt;</pre>
-</div></div><h2 id="Localization-I18nInterceptor">I18n 
Interceptor</h2><p>Essentially, the i18n Interceptor pushes a locale into the 
ActionContext map upon every request. The framework components that support 
localization all utilize the ActionContext locale. See <a shape="rect" 
href="i18n-interceptor.html">I18n Interceptor</a> for details.</p><h2 
id="Localization-GlobalResources(struts.custom.i18n.resources)instruts.properties">Global
 Resources (struts.custom.i18n.resources) in 
<code>struts.properties</code></h2><p>A global resource bundle could be 
specified programmatically, as well as the locale.</p><h2 
id="Localization-FormattingDatesandNumbers">Formatting Dates and 
Numbers</h2><p>See <a shape="rect" 
href="formatting-dates-and-numbers.html">Formatting Dates and Numbers</a> for 
more details and examples.</p><h2 
id="Localization-ComparisonwithStruts1">Comparison with Struts 1</h2><p>Struts 
1 users should be familiar with the application.properties resource bundle, 
where you can pu
 t all the messages in the application that are going to be translated. Struts 
2, though, splits the resource bundles per action or model class, and you may 
end up with duplicated messages in those resource bundles. A quick fix for that 
is to create a file called ActionSupport.properties in com/opensymphony/xwork2 
and put it on your classpath. This will only work well if all your actions 
subclass XWork2's ActionSupport.</p><h2 
id="Localization-Usingonlyglobalbundles">Using only global bundles</h2><p>If 
you don't need to use the package-scan-functionality and only base on the 
global bundles (those provided by the framework and 
via&#160;<code>struts.custom.i18n.resources</code>) you can use 
existing&#160;<code>GlobalLocalizedTextProvider</code> implementation. To use 
this please define the following option in 
your&#160;<code>struts.xml</code>:</p><div class="code panel pdl" 
style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" 
style="font-size:12px;">&lt;constant name="struts.localizedTextProvider" 
value="global-only" /&gt;</pre>
-</div></div><h2 
id="Localization-CustomTextProviderandTextProviderFactory">Custom TextProvider 
and TextProviderFactory</h2><p>If you want use a different logic to search for 
localized messages, or you want to use a database or just want to search 
default bundles, you must implement both those interfaces (or subclass the 
existing implementations). You can check a small <a shape="rect" 
class="external-link" 
href="https://github.com/apache/struts-examples/tree/master/text-provider"; 
rel="nofollow">example app</a> how to use both. Please remember that 
the&#160;<code>TextProvider</code> interface is implemented by 
the&#160;<code>ActioSupport</code> class, that's why an extra layer 
-&#160;<code>TextProviderFactory</code> - is needed.</p><h2 
id="Localization-Next:">Next: <a shape="rect" href="type-conversion.html">Type 
Conversion</a></h2></div>
+&lt;/action&gt;</plain-text-body><p>it will use a default class defined 
with&#160;<code>default-class-ref</code><span style="color: 
rgb(34,34,34);">&#160;in&#160;<code>struts-default.xml</code> which 
is&#160;<code>com.opensymphony.xwork2.ActionSupport</code>. It means you have 
two options here to get I18N working in that case:</span></p><ul><li><span 
style="color: 
rgb(34,34,34);">define&#160;<code>com/opensymphony/xwork2/ActionSupport.properties</code>
 and put messages there</span></li><li><span style="color: 
rgb(34,34,34);">point&#160;<code>default-class-ref</code> to your base class 
and then defined appropriated <code>.properties</code>&#160;file (corresponding 
to class' name or package)</span></li></ul><p><span style="font-size: 
20.0px;line-height: 1.5;">Examples</span></p><p>There are several ways to 
access the message resources, including <code>getText</code>, the 
<code>text</code> tag, and the <code>i18n</code> tag.</p><h3 
id="Localization-UsinggetTextfromaTag">Using <code>get
 Text</code> from a Tag</h3><p>To display i18n text, use a call to 
<code>getText</code> in the <a shape="rect" href="property.html">property</a> 
tag, or any other tag, such as the UI tags. (The <code>getText</code> technique 
is especially useful for labels of UI 
tags.)<plain-text-body>{snippet:id=i18nExample|javadoc=true|lang=xml|url=org.apache.struts2.components.Property}</plain-text-body></p><rich-text-body><p>The
 default implementation of <code>TextProvider</code> which is used in 
<code>ActionSupport</code> perform evaluation of value read from bundle base on 
the provided key, see <a shape="rect" href="localizing-output.html">Localizing 
Output</a> for an example.</p></rich-text-body><h3 
id="Localization-Usingthetexttag">Using the <code>text</code> tag</h3><p>The <a 
shape="rect" href="text.html">text</a> tag retrieves a message from the default 
resource 
bundle.<plain-text-body>{snippet:id=i18nExample|javadoc=true|lang=xml|url=org.apache.struts2.components.Text}</plain-text-body></p
 ><h3 id="Localization-UsingtheI18ntag">Using the <code>I18n</code> 
 >tag</h3><p>The <a shape="rect" href="i18n.html">i18n</a> tag pushes an 
 >arbitrary resource bundle on to the value stack. Other tags within the scope 
 >of the i18n tag can display messages from that resource 
 >bundle.<plain-text-body>{snippet:id=i18nExample|javadoc=true|lang=xml|url=org.apache.struts2.components.I18n}</plain-text-body></p><parameter
 > ac:name="">i18n with 
 >SiteMesh</parameter><rich-text-body><p>Internationalizing SiteMesh decorators 
 >is possible, but there are quirks. See <a shape="rect" 
 >href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33343";>SiteMesh
 > Plugin</a> for more.</p></rich-text-body><h3 
 >id="Localization-UsingtheKeyattributeofUITags">Using the Key attribute of UI 
 >Tags</h3><p>The key attribute of most UI tags can be used to retrieve a 
 >message from a resource bundle:</p><plain-text-body>&lt;s:textfield 
 >key="some.key" name="textfieldName"/&gt;</plain-text-body><h2 
 >id="Localization-I1
 8nInterceptor">I18n Interceptor</h2><p>Essentially, the i18n Interceptor 
pushes a locale into the ActionContext map upon every request. The framework 
components that support localization all utilize the ActionContext locale. See 
<a shape="rect" href="i18n-interceptor.html">I18n Interceptor</a> for 
details.</p><h2 
id="Localization-GlobalResources(struts.custom.i18n.resources)instruts.properties">Global
 Resources (struts.custom.i18n.resources) in 
<code>struts.properties</code></h2><p>A global resource bundle could be 
specified programmatically, as well as the locale.</p><h2 
id="Localization-FormattingDatesandNumbers">Formatting Dates and 
Numbers</h2><p>See <a shape="rect" 
href="formatting-dates-and-numbers.html">Formatting Dates and Numbers</a> for 
more details and examples.</p><h2 
id="Localization-ComparisonwithStruts1">Comparison with Struts 1</h2><p>Struts 
1 users should be familiar with the application.properties resource bundle, 
where you can put all the messages in the applicati
 on that are going to be translated. Struts 2, though, splits the resource 
bundles per action or model class, and you may end up with duplicated messages 
in those resource bundles. A quick fix for that is to create a file called 
ActionSupport.properties in com/opensymphony/xwork2 and put it on your 
classpath. This will only work well if all your actions subclass XWork2's 
ActionSupport.</p><h2 id="Localization-Usingonlyglobalbundles">Using only 
global bundles</h2><p>If you don't need to use the package-scan-functionality 
and only base on the global bundles (those provided by the framework and 
via&#160;<code>struts.custom.i18n.resources</code>) you can use 
existing&#160;<code>GlobalLocalizedTextProvider</code> implementation. To use 
this please define the following option in 
your&#160;<code>struts.xml</code>:</p><parameter 
ac:name="">xml</parameter><plain-text-body>&lt;constant 
name="struts.localizedTextProvider" value="global-only" 
/&gt;</plain-text-body><h2 id="Localization-CustomTex
 tProviderandTextProviderFactory">Custom TextProvider and 
TextProviderFactory</h2><p>If you want use a different logic to search for 
localized messages, or you want to use a database or just want to search 
default bundles, you must implement both those interfaces (or subclass the 
existing implementations). You can check a small <a shape="rect" 
class="external-link" 
href="https://github.com/apache/struts-examples/tree/master/text-provider"; 
rel="nofollow">example app</a> how to use both. Please remember that 
the&#160;<code>TextProvider</code> interface is implemented by 
the&#160;<code>ActioSupport</code> class, that's why an extra layer 
-&#160;<code>TextProviderFactory</code> - is needed.</p><h2 
id="Localization-Next:">Next: <a shape="rect" href="type-conversion.html">Type 
Conversion</a></h2></div>
         </div>
 
         

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/logger-interceptor.html
----------------------------------------------------------------------
diff --git a/content/docs/logger-interceptor.html 
b/content/docs/logger-interceptor.html
index 09b1757..5f64075 100644
--- a/content/docs/logger-interceptor.html
+++ b/content/docs/logger-interceptor.html
@@ -156,7 +156,7 @@ This interceptor logs the start and end of the execution an 
action (in English-o
 <h2 id="LoggerInterceptor-Examples">Examples</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 &lt;!-- prints out a message before and after the immediate action execution 
--&gt;
 &lt;action name=&quot;someAction&quot; 
class=&quot;com.examples.SomeAction&quot;&gt;
     &lt;interceptor-ref name=&quot;completeStack&quot;/&gt;

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/merge.html
----------------------------------------------------------------------
diff --git a/content/docs/merge.html b/content/docs/merge.html
index 0f60575..43a5258 100644
--- a/content/docs/merge.html
+++ b/content/docs/merge.html
@@ -162,7 +162,7 @@ be the logic.</p>
 <h2 id="merge-Examples">Examples</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 public class MergeIteratorTagAction extends ActionSupport {
 
  private List myList1;
@@ -205,7 +205,7 @@ public class MergeIteratorTagAction extends ActionSupport {
 ]]></script>
 </div></div>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 &lt;s:merge var=&quot;myMergedIterator1&quot;&gt;
      &lt;s:param value=&quot;%{myList1}&quot; /&gt;
      &lt;s:param value=&quot;%{myList2}&quot; /&gt;

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/message-store-interceptor.html
----------------------------------------------------------------------
diff --git a/content/docs/message-store-interceptor.html 
b/content/docs/message-store-interceptor.html
index 07d4c7b..64ca120 100644
--- a/content/docs/message-store-interceptor.html
+++ b/content/docs/message-store-interceptor.html
@@ -34,20 +34,6 @@ under the License.
             color:                 #666;
         }
     </style>
-    <link href='https://struts.apache.org/highlighter/style/shCoreStruts.css' 
rel='stylesheet' type='text/css' />
-    <link href='https://struts.apache.org/highlighter/style/shThemeStruts.css' 
rel='stylesheet' type='text/css' />
-    <script src='https://struts.apache.org/highlighter/js/shCore.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushPlain.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushXml.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJava.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushJScript.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushGroovy.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushBash.js' 
type='text/javascript'></script>
-    <script src='https://struts.apache.org/highlighter/js/shBrushCss.js' 
type='text/javascript'></script>
-    <script type="text/javascript">
-        SyntaxHighlighter.defaults['toolbar'] = false;
-        SyntaxHighlighter.all();
-    </script>
     <script type="text/javascript" language="javascript">
         var hide = null;
         var show = null;
@@ -139,19 +125,14 @@ under the License.
 
     <div class="pagecontent">
         <div class="wiki-content">
-            <div id="ConfluenceContent"><p>An interceptor to store a <a 
shape="rect" class="createlink" 
href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=ValidationAware&amp;linkCreation=true&amp;fromPageId=19580";>ValidationAware</a>&#160;action's
 messages / errors and field errors into&#160;HTTP Session, such that it will 
be retrievable at a later stage. This allows the action's message /&#160;errors 
and field errors to be available longer that just the particular HTTP 
request.</p><p>If no session exists, nothing will be stored and can be 
retrieved later. In other terms,&#160;the application is responsible to open 
the session.</p><p>In the <strong>STORE</strong>&#160;mode, the interceptor 
will store the <a shape="rect" class="createlink" 
href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=ValidationAware&amp;linkCreation=true&amp;fromPageId=19580";>ValidationAware</a>&#160;action's
 message / errors&#160;and fi
 eld errors into HTTP session.</p><p>In the 
<strong>RETRIEVE</strong>&#160;mode, the interceptor will retrieve the stored 
action's message / errors and field&#160;errors and put them back into the <a 
shape="rect" class="createlink" 
href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=ValidationAware&amp;linkCreation=true&amp;fromPageId=19580";>ValidationAware</a>&#160;action.</p><p>In
 the <strong>AUTOMATIC</strong>&#160;mode, the interceptor will always retrieve 
the stored action's message / errors&#160;and field errors and put them back 
into the [ValidationAware] action, and after Action execution,&#160;if the <a 
shape="rect" class="createlink" 
href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Result&amp;linkCreation=true&amp;fromPageId=19580";>Result</a>&#160;is
 an instance of <a shape="rect" class="createlink" 
href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=ServletRedirec
 tResult&amp;linkCreation=true&amp;fromPageId=19580">ServletRedirectResult</a>, 
the action's message / errors&#160;and field errors into automatically be 
stored in the HTTP session..</p><p>The interceptor does nothing in the 
<strong>NONE</strong>&#160;mode, which is the default.</p><p>The operation mode 
could be switched using:</p><ol><li><p>Setting the interceptor parameter 
eg.</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" 
style="font-size:12px;">&lt;action name="submitApplication" ...&gt;
+            <div id="ConfluenceContent"><p>An interceptor to store a <a 
shape="rect" class="createlink" 
href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=ValidationAware&amp;linkCreation=true&amp;fromPageId=19580";>ValidationAware</a>&#160;action's
 messages / errors and field errors into&#160;HTTP Session, such that it will 
be retrievable at a later stage. This allows the action's message /&#160;errors 
and field errors to be available longer that just the particular HTTP 
request.</p><p>If no session exists, nothing will be stored and can be 
retrieved later. In other terms,&#160;the application is responsible to open 
the session.</p><p>In the <strong>STORE</strong>&#160;mode, the interceptor 
will store the <a shape="rect" class="createlink" 
href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=ValidationAware&amp;linkCreation=true&amp;fromPageId=19580";>ValidationAware</a>&#160;action's
 message / errors&#160;and fi
 eld errors into HTTP session.</p><p>In the 
<strong>RETRIEVE</strong>&#160;mode, the interceptor will retrieve the stored 
action's message / errors and field&#160;errors and put them back into the <a 
shape="rect" class="createlink" 
href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=ValidationAware&amp;linkCreation=true&amp;fromPageId=19580";>ValidationAware</a>&#160;action.</p><p>In
 the <strong>AUTOMATIC</strong>&#160;mode, the interceptor will always retrieve 
the stored action's message / errors&#160;and field errors and put them back 
into the [ValidationAware] action, and after Action execution,&#160;if the <a 
shape="rect" class="createlink" 
href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=Result&amp;linkCreation=true&amp;fromPageId=19580";>Result</a>&#160;is
 an instance of <a shape="rect" class="createlink" 
href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&amp;title=ServletRedirec
 tResult&amp;linkCreation=true&amp;fromPageId=19580">ServletRedirectResult</a>, 
the action's message / errors&#160;and field errors into automatically be 
stored in the HTTP session..</p><p>The interceptor does nothing in the 
<strong>NONE</strong>&#160;mode, which is the default.</p><p>The operation mode 
could be switched using:</p><ol><li><p>Setting the interceptor parameter 
eg.</p><parameter ac:name="language">xml</parameter><plain-text-body>&lt;action 
name="submitApplication" ...&gt;
     &lt;interceptor-ref name="store"/&gt;
            &lt;param name="operationMode"&gt;STORE&lt;/param&gt;
     &lt;/interceptor-ref&gt;
        &lt;interceptor-ref name="defaultStack" /&gt;
     ....
-&lt;/action&gt;</pre>
-</div></div></li><li><p>Through request parameter 
<code>allowRequestParameterSwitch</code>&#160;must be 'true' which is the 
default</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" 
style="font-size:12px;">the request will have the operation mode in 'STORE'
-http://localhost:8080/context/submitApplication.action?operationMode=STORE</pre>
-</div></div></li></ol><h2 
id="MessageStoreInterceptor-Parameters">Parameters</h2><ul><li><code>allowRequestParameterSwitch</code>&#160;-
 To enable request parameter that could switch the operation mode&#160;of this 
interceptor.</li><li><code>requestParameterSwitch</code>&#160;- The request 
parameter that will indicate what mode this&#160;interceptor is 
in.</li><li><code>operationMode</code>&#160;- The operation mode this 
interceptor should be in&#160;(either <strong>STORE</strong>, 
<strong>RETRIEVE</strong>, <strong>AUTOMATIC</strong>, or 
<strong>NONE</strong>). <strong>NONE&#160;</strong>being the 
default.</li></ul><h2 
id="MessageStoreInterceptor-ExtendingtheInterceptor">Extending the 
Interceptor</h2><p>There is no known extensions.</p><h2 
id="MessageStoreInterceptor-Examples">Examples</h2><div class="code panel pdl" 
style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" 
style="font-size:12px;">&lt;action name="submitApplication" ....&gt;
+&lt;/action&gt;</plain-text-body></li><li><p>Through request parameter 
<code>allowRequestParameterSwitch</code>&#160;must be 'true' which is the 
default</p><plain-text-body>the request will have the operation mode in 'STORE'
+http://localhost:8080/context/submitApplication.action?operationMode=STORE</plain-text-body></li></ol><h2
 
id="MessageStoreInterceptor-Parameters">Parameters</h2><ul><li><code>allowRequestParameterSwitch</code>&#160;-
 To enable request parameter that could switch the operation mode&#160;of this 
interceptor.</li><li><code>requestParameterSwitch</code>&#160;- The request 
parameter that will indicate what mode this&#160;interceptor is 
in.</li><li><code>operationMode</code>&#160;- The operation mode this 
interceptor should be in&#160;(either <strong>STORE</strong>, 
<strong>RETRIEVE</strong>, <strong>AUTOMATIC</strong>, or 
<strong>NONE</strong>). <strong>NONE&#160;</strong>being the 
default.</li></ul><h2 
id="MessageStoreInterceptor-ExtendingtheInterceptor">Extending the 
Interceptor</h2><p>There is no known extensions.</p><h2 
id="MessageStoreInterceptor-Examples">Examples</h2><parameter 
ac:name="">xml</parameter><plain-text-body>&lt;action name="submitApplication" 
....&gt;
        &lt;interceptor-ref name="store"&gt;
                &lt;param name="operationMode"&gt;STORE&lt;/param&gt;
        &lt;/interceptor-ref&gt;
@@ -165,8 +146,7 @@ 
http://localhost:8080/context/submitApplication.action?operationMode=STORE</pre>
                &lt;param name="operationMode"&gt;RETRIEVE&lt;/param&gt;
        &lt;/interceptor-ref&gt;
        &lt;result&gt;applicationFailed.jsp&lt;/result&gt;
-&lt;/action&gt;</pre>
-</div></div><p>With the example above, 
<strong>submitApplication.action</strong>&#160;will have the action messages / 
errors / field errors stored&#160;in the HTTP Session. Later when needed, (in 
this case, when <strong>applicationFailed.action</strong>&#160;is fired, 
it&#160;will get the action messages / errors / field errors stored in the HTTP 
Session and put them back into&#160;the action.</p><p>&#160;</p></div>
+&lt;/action&gt;</plain-text-body><p>With the example above, 
<strong>submitApplication.action</strong>&#160;will have the action messages / 
errors / field errors stored&#160;in the HTTP Session. Later when needed, (in 
this case, when <strong>applicationFailed.action</strong>&#160;is fired, 
it&#160;will get the action messages / errors / field errors stored in the HTTP 
Session and put them back into&#160;the action.</p><p>&#160;</p></div>
         </div>
 
         

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/migration-guide.html
----------------------------------------------------------------------
diff --git a/content/docs/migration-guide.html 
b/content/docs/migration-guide.html
index d381a26..0943f82 100644
--- a/content/docs/migration-guide.html
+++ b/content/docs/migration-guide.html
@@ -125,7 +125,7 @@ under the License.
 
     <div class="pagecontent">
         <div class="wiki-content">
-            <div id="ConfluenceContent"><p>Getting here from there.</p><h3 
id="MigrationGuide-VersionNotes2.5.x">Version Notes 2.5.x</h3><ul><li><a 
shape="rect" href="version-notes-2512.html">Version Notes 2.5.12</a></li><li><a 
shape="rect" href="version-notes-25101.html">Version Notes 
2.5.10.1</a></li><li><a shape="rect" href="version-notes-2510.html">Version 
Notes 2.5.10</a></li><li><a shape="rect" href="version-notes-258.html">Version 
Notes 2.5.8</a></li><li><a shape="rect" href="version-notes-255.html">Version 
Notes 2.5.5</a></li><li><a shape="rect" href="version-notes-252.html">Version 
Notes 2.5.2</a></li><li><a shape="rect" href="version-notes-251.html">Version 
Notes 2.5.1</a></li><li><a shape="rect" href="version-notes-25.html">Version 
Notes 2.5</a></li></ul><h3 id="MigrationGuide-VersionNotes2.3.x">Version Notes 
2.3.x</h3><ul><li><a shape="rect" href="version-notes-2333.html">Version Notes 
2.3.33</a></li><li><a shape="rect" href="version-notes-2332.html">Version Notes 
2.3.32
 </a></li><li><a shape="rect" href="version-notes-2331.html">Version Notes 
2.3.31</a></li><li><a shape="rect" href="version-notes-2330.html">Version Notes 
2.3.30</a></li><li><a shape="rect" href="version-notes-2329.html">Version Notes 
2.3.29</a></li><li><a shape="rect" href="version-notes-23281.html">Version 
Notes 2.3.28.1</a></li><li><a shape="rect" 
href="version-notes-2328.html">Version Notes 2.3.28</a></li><li><a shape="rect" 
href="version-notes-23243.html">Version Notes 2.3.24.3</a></li><li><a 
shape="rect" href="version-notes-23241.html">Version Notes 
2.3.24.1</a></li><li><a shape="rect" href="version-notes-2324.html">Version 
Notes 2.3.24</a></li><li><a shape="rect" 
href="version-notes-23203.html">Version Notes 2.3.20.3</a></li><li><a 
shape="rect" href="version-notes-23201.html">Version Notes 
2.3.20.1</a></li><li><a shape="rect" href="version-notes-2320.html">Version 
Notes 2.3.20</a></li><li><a shape="rect" 
href="version-notes-23163.html">Version Notes 2.3.16.3</a></li><li><a sha
 pe="rect" href="version-notes-23162.html">Version Notes 
2.3.16.2</a></li><li><a shape="rect" href="version-notes-2316.html">Version 
Notes 2.3.16.1</a></li><li><a shape="rect" 
href="version-notes-2316.html">Version Notes 2.3.16</a></li><li><a shape="rect" 
href="version-notes-23153.html">Version Notes 2.3.15.3</a></li><li><a 
shape="rect" href="version-notes-23152.html">Version Notes 
2.3.15.2</a></li><li><a shape="rect" href="version-notes-23151.html">Version 
Notes 2.3.15.1</a></li><li><a shape="rect" 
href="version-notes-2315.html">Version Notes 2.3.15</a></li><li><a shape="rect" 
href="version-notes-23143.html">Version Notes 2.3.14.3</a></li><li><a 
shape="rect" href="version-notes-23142.html">Version Notes 
2.3.14.2</a></li><li><a shape="rect" href="version-notes-23141.html">Version 
Notes 2.3.14.1</a></li><li><a shape="rect" 
href="version-notes-2314.html">Version Notes 2.3.14</a></li><li><a shape="rect" 
href="version-notes-23120.html">Version Notes 2.3.12.0</a></li><li><a 
shape="rect" h
 ref="version-notes-238.html">Version Notes 2.3.8</a></li><li><a shape="rect" 
href="version-notes-237.html">Version Notes 2.3.7</a></li><li><a shape="rect" 
href="version-notes-2341.html">Version Notes 2.3.4.1</a></li><li><a 
shape="rect" href="version-notes-234.html">Version Notes 2.3.4</a></li><li><a 
shape="rect" href="version-notes-233.html">Version Notes 2.3.3</a></li><li><a 
shape="rect" href="version-notes-2312.html">Version Notes 
2.3.1.2</a></li><li><a shape="rect" href="version-notes-2311.html">Version 
Notes 2.3.1.1</a></li><li><a shape="rect" href="version-notes-231.html">Version 
Notes 2.3.1</a></li></ul><h3 id="MigrationGuide-VersionNotes2.2.x">Version 
Notes 2.2.x</h3><ul><li><a shape="rect" href="version-notes-2231.html">Version 
Notes 2.2.3.1</a></li><li><a shape="rect" href="version-notes-223.html">Version 
Notes 2.2.3</a></li><li><a shape="rect" href="version-notes-2211.html">Version 
Notes 2.2.1.1</a></li><li><a shape="rect" href="version-notes-221.html">Version 
Notes 2.2.1<
 /a></li></ul><h3 id="MigrationGuide-VersionNotes2.1.x">Version Notes 
2.1.x</h3><ul><li><a shape="rect" href="version-notes-2181.html">Version Notes 
2.1.8.1</a></li><li><a shape="rect" href="version-notes-218.html">Version Notes 
2.1.8</a></li><li><a shape="rect" href="version-notes-216.html">Version Notes 
2.1.6</a></li><li><a shape="rect" href="version-notes-215.html">Version Notes 
2.1.5</a></li><li><a shape="rect" href="version-notes-214.html">Version Notes 
2.1.4</a></li><li><a shape="rect" href="version-notes-213.html">Version Notes 
2.1.3</a></li><li><a shape="rect" href="version-notes-212.html">Version Notes 
2.1.2</a></li><li><a shape="rect" href="version-notes-211.html">Version Notes 
2.1.1</a></li><li><a shape="rect" href="version-notes-210.html">Version Notes 
2.1.0</a></li></ul><h3 id="MigrationGuide-ReleaseNotes2.0.x">Release Notes 
2.0.x</h3><ul><li><a shape="rect" href="release-notes-2014.html">Release Notes 
2.0.14</a></li><li><a shape="rect" href="release-notes-2013.html">Rel
 ease Notes 2.0.13</a></li><li><a shape="rect" 
href="release-notes-2012.html">Release Notes 2.0.12</a></li><li><a shape="rect" 
href="release-notes-20112.html">Release Notes 2.0.11.2</a></li><li><a 
shape="rect" href="release-notes-20111.html">Release Notes 
2.0.11.1</a></li><li><a shape="rect" href="release-notes-2011.html">Release 
Notes 2.0.11</a></li><li><a shape="rect" href="release-notes-2010.html">Release 
Notes 2.0.10</a></li><li><a shape="rect" href="release-notes-209.html">Release 
Notes 2.0.9</a></li><li><a shape="rect" href="release-notes-208.html">Release 
Notes 2.0.8</a></li><li><a shape="rect" href="release-notes-207.html">Release 
Notes 2.0.7</a></li><li><a shape="rect" href="release-notes-206.html">Release 
Notes 2.0.6</a></li><li><a shape="rect" href="release-notes-205.html">Release 
Notes 2.0.5</a></li><li><a shape="rect" href="release-notes-204.html">Release 
Notes 2.0.4</a></li><li><a shape="rect" href="release-notes-203.html">Release 
Notes 2.0.3</a></li><li><a shape="rect"
  href="release-notes-202.html">Release Notes 2.0.2</a></li><li><a shape="rect" 
href="release-notes-201.html">Release Notes 2.0.1</a></li><li><a shape="rect" 
href="release-notes-200.html">Release Notes 2.0.0</a></li></ul><h3 
id="MigrationGuide-Struts2.3toStruts2.5">Struts 2.3 to Struts 2.5</h3><div 
class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" 
rowspan="1" class="confluenceTh"><p><a shape="rect" 
href="struts-23-to-25-migration.html">Struts 2.3 to 2.5 
migration</a></p></th><td colspan="1" rowspan="1" 
class="confluenceTd">Migration guide.</td></tr></tbody></table></div><h3 
id="MigrationGuide-Struts1toStruts2">Struts 1 to Struts 2</h3><div 
class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" 
rowspan="1" class="confluenceTh"><p><a shape="rect" 
href="comparing-struts-1-and-2.html">Comparing Struts 1 and 2</a></p></th><td 
colspan="1" rowspan="1" class="confluenceTd"><p>How are Struts 1 and Struts 2 
alike? How are they different?</p></td
 ></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" 
 >href="struts-1-solutions.html">Struts 1 Solutions</a></p></th><td colspan="1" 
 >rowspan="1" class="confluenceTd"><p>Various issues (and hopefully their 
 >solutions!) encountered during migrations to Struts 2.</p></td></tr><tr><th 
 >colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" 
 >href="migration-strategies.html">Migration Strategies</a></p></th><td 
 >colspan="1" rowspan="1" class="confluenceTd"><p>Steps and overall strategies 
 >for migrating Struts 1 applications to Struts 2.</p></td></tr><tr><th 
 >colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" 
 >href="migration-tools.html">Migration Tools</a></p></th><td colspan="1" 
 >rowspan="1" class="confluenceTd"><p>Development tools to help aid the 
 >migration process.</p></td></tr></tbody></table></div><h4 
 >id="MigrationGuide-Tutorials">Tutorials</h4><div class="table-wrap"><table 
 >class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="con
 fluenceTh"><p><a shape="rect" class="external-link" 
href="http://www.infoq.com/news/migrating-struts2"; rel="nofollow">Migrating 
Applications to Struts 2 </a></p></th><td colspan="1" rowspan="1" 
class="confluenceTd"><p>A three-part series by Ian Roughley (Sep 
2006)</p></td></tr></tbody></table></div><h4 
id="MigrationGuide-Roadmap">Roadmap</h4><div class="table-wrap"><table 
class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"><p><a shape="rect" class="external-link" 
href="http://struts.apache.org/roadmap.html#new";>Roadmap FAQ</a></p></th><td 
colspan="1" rowspan="1" class="confluenceTd"><p>What's in store for Struts 
2?</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a 
shape="rect" class="external-link" 
href="http://www.oreillynet.com/onjava/blog/2006/10/my_history_of_struts_2.html";
 rel="nofollow">A History of Struts 2</a></p></th><td colspan="1" rowspan="1" 
class="confluenceTd"><p>Don Brown's summary of events</p></td></tr></tbody></
 table></div><h3 id="MigrationGuide-Webwork2.2toStruts2">Webwork 2.2 to Struts 
2</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th 
colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" 
href="key-changes-from-webwork-2.html">Key Changes From WebWork 
2</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>What has been 
removed or changed from WebWork 2.2 to Struts 2</p></td></tr><tr><th 
colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" 
href="webwork-2-migration-strategies.html">WebWork 2 Migration 
Strategies</a></p></th><td colspan="1" rowspan="1" 
class="confluenceTd"><p>Steps and overall strategies for migrating WebWork 2 
applications to Struts 2.</p></td></tr></tbody></table></div><h2 
id="MigrationGuide-FAQs">FAQs</h2><ul><li><a shape="rect" 
href="where-do-we-get-the-latest-version-the-framework.html">Where do we get 
the latest version the framework</a>?</li><li><a shape="rect" 
href="what-are-some-of-the-frameworks-best-featur
 es.html">What are some of the framework's best features</a>?</li><li><a 
shape="rect" href="what-is-the-actioncontext.html">What is the 
ActionContext?</a></li></ul><h2 id="MigrationGuide-Next:">Next: <a shape="rect" 
href="contributors-guide.html">Contributors Guide</a></h2></div>
+            <div id="ConfluenceContent"><p>Getting here from there.</p><h3 
id="MigrationGuide-VersionNotes2.5.x">Version Notes 2.5.x</h3><ul><li><a 
shape="rect" href="version-notes-2513.html">Version Notes 2.5.13</a></li><li><a 
shape="rect" href="version-notes-2512.html">Version Notes 2.5.12</a></li><li><a 
shape="rect" href="version-notes-25101.html">Version Notes 
2.5.10.1</a></li><li><a shape="rect" href="version-notes-2510.html">Version 
Notes 2.5.10</a></li><li><a shape="rect" href="version-notes-258.html">Version 
Notes 2.5.8</a></li><li><a shape="rect" href="version-notes-255.html">Version 
Notes 2.5.5</a></li><li><a shape="rect" href="version-notes-252.html">Version 
Notes 2.5.2</a></li><li><a shape="rect" href="version-notes-251.html">Version 
Notes 2.5.1</a></li><li><a shape="rect" href="version-notes-25.html">Version 
Notes 2.5</a></li></ul><h3 id="MigrationGuide-VersionNotes2.3.x">Version Notes 
2.3.x</h3><ul><li><a shape="rect" href="version-notes-2333.html">Version Notes 
2.3.33
 </a></li><li><a shape="rect" href="version-notes-2332.html">Version Notes 
2.3.32</a></li><li><a shape="rect" href="version-notes-2331.html">Version Notes 
2.3.31</a></li><li><a shape="rect" href="version-notes-2330.html">Version Notes 
2.3.30</a></li><li><a shape="rect" href="version-notes-2329.html">Version Notes 
2.3.29</a></li><li><a shape="rect" href="version-notes-23281.html">Version 
Notes 2.3.28.1</a></li><li><a shape="rect" 
href="version-notes-2328.html">Version Notes 2.3.28</a></li><li><a shape="rect" 
href="version-notes-23243.html">Version Notes 2.3.24.3</a></li><li><a 
shape="rect" href="version-notes-23241.html">Version Notes 
2.3.24.1</a></li><li><a shape="rect" href="version-notes-2324.html">Version 
Notes 2.3.24</a></li><li><a shape="rect" 
href="version-notes-23203.html">Version Notes 2.3.20.3</a></li><li><a 
shape="rect" href="version-notes-23201.html">Version Notes 
2.3.20.1</a></li><li><a shape="rect" href="version-notes-2320.html">Version 
Notes 2.3.20</a></li><li><a shape=
 "rect" href="version-notes-23163.html">Version Notes 2.3.16.3</a></li><li><a 
shape="rect" href="version-notes-23162.html">Version Notes 
2.3.16.2</a></li><li><a shape="rect" href="version-notes-2316.html">Version 
Notes 2.3.16.1</a></li><li><a shape="rect" 
href="version-notes-2316.html">Version Notes 2.3.16</a></li><li><a shape="rect" 
href="version-notes-23153.html">Version Notes 2.3.15.3</a></li><li><a 
shape="rect" href="version-notes-23152.html">Version Notes 
2.3.15.2</a></li><li><a shape="rect" href="version-notes-23151.html">Version 
Notes 2.3.15.1</a></li><li><a shape="rect" 
href="version-notes-2315.html">Version Notes 2.3.15</a></li><li><a shape="rect" 
href="version-notes-23143.html">Version Notes 2.3.14.3</a></li><li><a 
shape="rect" href="version-notes-23142.html">Version Notes 
2.3.14.2</a></li><li><a shape="rect" href="version-notes-23141.html">Version 
Notes 2.3.14.1</a></li><li><a shape="rect" 
href="version-notes-2314.html">Version Notes 2.3.14</a></li><li><a shape="rect" 
href
 ="version-notes-23120.html">Version Notes 2.3.12.0</a></li><li><a shape="rect" 
href="version-notes-238.html">Version Notes 2.3.8</a></li><li><a shape="rect" 
href="version-notes-237.html">Version Notes 2.3.7</a></li><li><a shape="rect" 
href="version-notes-2341.html">Version Notes 2.3.4.1</a></li><li><a 
shape="rect" href="version-notes-234.html">Version Notes 2.3.4</a></li><li><a 
shape="rect" href="version-notes-233.html">Version Notes 2.3.3</a></li><li><a 
shape="rect" href="version-notes-2312.html">Version Notes 
2.3.1.2</a></li><li><a shape="rect" href="version-notes-2311.html">Version 
Notes 2.3.1.1</a></li><li><a shape="rect" href="version-notes-231.html">Version 
Notes 2.3.1</a></li></ul><h3 id="MigrationGuide-VersionNotes2.2.x">Version 
Notes 2.2.x</h3><ul><li><a shape="rect" href="version-notes-2231.html">Version 
Notes 2.2.3.1</a></li><li><a shape="rect" href="version-notes-223.html">Version 
Notes 2.2.3</a></li><li><a shape="rect" href="version-notes-2211.html">Version 
Notes 2.2.1.
 1</a></li><li><a shape="rect" href="version-notes-221.html">Version Notes 
2.2.1</a></li></ul><h3 id="MigrationGuide-VersionNotes2.1.x">Version Notes 
2.1.x</h3><ul><li><a shape="rect" href="version-notes-2181.html">Version Notes 
2.1.8.1</a></li><li><a shape="rect" href="version-notes-218.html">Version Notes 
2.1.8</a></li><li><a shape="rect" href="version-notes-216.html">Version Notes 
2.1.6</a></li><li><a shape="rect" href="version-notes-215.html">Version Notes 
2.1.5</a></li><li><a shape="rect" href="version-notes-214.html">Version Notes 
2.1.4</a></li><li><a shape="rect" href="version-notes-213.html">Version Notes 
2.1.3</a></li><li><a shape="rect" href="version-notes-212.html">Version Notes 
2.1.2</a></li><li><a shape="rect" href="version-notes-211.html">Version Notes 
2.1.1</a></li><li><a shape="rect" href="version-notes-210.html">Version Notes 
2.1.0</a></li></ul><h3 id="MigrationGuide-ReleaseNotes2.0.x">Release Notes 
2.0.x</h3><ul><li><a shape="rect" href="release-notes-2014.html">Rel
 ease Notes 2.0.14</a></li><li><a shape="rect" 
href="release-notes-2013.html">Release Notes 2.0.13</a></li><li><a shape="rect" 
href="release-notes-2012.html">Release Notes 2.0.12</a></li><li><a shape="rect" 
href="release-notes-20112.html">Release Notes 2.0.11.2</a></li><li><a 
shape="rect" href="release-notes-20111.html">Release Notes 
2.0.11.1</a></li><li><a shape="rect" href="release-notes-2011.html">Release 
Notes 2.0.11</a></li><li><a shape="rect" href="release-notes-2010.html">Release 
Notes 2.0.10</a></li><li><a shape="rect" href="release-notes-209.html">Release 
Notes 2.0.9</a></li><li><a shape="rect" href="release-notes-208.html">Release 
Notes 2.0.8</a></li><li><a shape="rect" href="release-notes-207.html">Release 
Notes 2.0.7</a></li><li><a shape="rect" href="release-notes-206.html">Release 
Notes 2.0.6</a></li><li><a shape="rect" href="release-notes-205.html">Release 
Notes 2.0.5</a></li><li><a shape="rect" href="release-notes-204.html">Release 
Notes 2.0.4</a></li><li><a shape="rec
 t" href="release-notes-203.html">Release Notes 2.0.3</a></li><li><a 
shape="rect" href="release-notes-202.html">Release Notes 2.0.2</a></li><li><a 
shape="rect" href="release-notes-201.html">Release Notes 2.0.1</a></li><li><a 
shape="rect" href="release-notes-200.html">Release Notes 2.0.0</a></li></ul><h3 
id="MigrationGuide-Struts2.3toStruts2.5">Struts 2.3 to Struts 2.5</h3><div 
class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" 
rowspan="1" class="confluenceTh"><p><a shape="rect" 
href="struts-23-to-25-migration.html">Struts 2.3 to 2.5 
migration</a></p></th><td colspan="1" rowspan="1" 
class="confluenceTd">Migration guide.</td></tr></tbody></table></div><h3 
id="MigrationGuide-Struts1toStruts2">Struts 1 to Struts 2</h3><div 
class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" 
rowspan="1" class="confluenceTh"><p><a shape="rect" 
href="comparing-struts-1-and-2.html">Comparing Struts 1 and 2</a></p></th><td 
colspan="1" rowspan="1" class="confl
 uenceTd"><p>How are Struts 1 and Struts 2 alike? How are they 
different?</p></td></tr><tr><th colspan="1" rowspan="1" 
class="confluenceTh"><p><a shape="rect" href="struts-1-solutions.html">Struts 1 
Solutions</a></p></th><td colspan="1" rowspan="1" 
class="confluenceTd"><p>Various issues (and hopefully their solutions!) 
encountered during migrations to Struts 2.</p></td></tr><tr><th colspan="1" 
rowspan="1" class="confluenceTh"><p><a shape="rect" 
href="migration-strategies.html">Migration Strategies</a></p></th><td 
colspan="1" rowspan="1" class="confluenceTd"><p>Steps and overall strategies 
for migrating Struts 1 applications to Struts 2.</p></td></tr><tr><th 
colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" 
href="migration-tools.html">Migration Tools</a></p></th><td colspan="1" 
rowspan="1" class="confluenceTd"><p>Development tools to help aid the migration 
process.</p></td></tr></tbody></table></div><h4 
id="MigrationGuide-Tutorials">Tutorials</h4><div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"><p><a shape="rect" class="external-link" 
href="http://www.infoq.com/news/migrating-struts2"; rel="nofollow">Migrating 
Applications to Struts 2 </a></p></th><td colspan="1" rowspan="1" 
class="confluenceTd"><p>A three-part series by Ian Roughley (Sep 
2006)</p></td></tr></tbody></table></div><h4 
id="MigrationGuide-Roadmap">Roadmap</h4><div class="table-wrap"><table 
class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh"><p><a shape="rect" class="external-link" 
href="http://struts.apache.org/roadmap.html#new";>Roadmap FAQ</a></p></th><td 
colspan="1" rowspan="1" class="confluenceTd"><p>What's in store for Struts 
2?</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a 
shape="rect" class="external-link" 
href="http://www.oreillynet.com/onjava/blog/2006/10/my_history_of_struts_2.html";
 rel="nofollow">A History of Struts 2</a></p></th><td colspan="1" rowspan="
 1" class="confluenceTd"><p>Don Brown's summary of 
events</p></td></tr></tbody></table></div><h3 
id="MigrationGuide-Webwork2.2toStruts2">Webwork 2.2 to Struts 2</h3><div 
class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" 
rowspan="1" class="confluenceTh"><p><a shape="rect" 
href="key-changes-from-webwork-2.html">Key Changes From WebWork 
2</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>What has been 
removed or changed from WebWork 2.2 to Struts 2</p></td></tr><tr><th 
colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" 
href="webwork-2-migration-strategies.html">WebWork 2 Migration 
Strategies</a></p></th><td colspan="1" rowspan="1" 
class="confluenceTd"><p>Steps and overall strategies for migrating WebWork 2 
applications to Struts 2.</p></td></tr></tbody></table></div><h2 
id="MigrationGuide-FAQs">FAQs</h2><ul><li><a shape="rect" 
href="where-do-we-get-the-latest-version-the-framework.html">Where do we get 
the latest version the framewor
 k</a>?</li><li><a shape="rect" 
href="what-are-some-of-the-frameworks-best-features.html">What are some of the 
framework's best features</a>?</li><li><a shape="rect" 
href="what-is-the-actioncontext.html">What is the 
ActionContext?</a></li></ul><h2 id="MigrationGuide-Next:">Next: <a shape="rect" 
href="contributors-guide.html">Contributors Guide</a></h2></div>
         </div>
 
                     <div class="tabletitle">
@@ -385,6 +385,9 @@ under the License.
                                     $page.link($child)
                     <span class="smalltext">(Apache Struts 2 
Documentation)</span>
                     <br>
+                                    $page.link($child)
+                    <span class="smalltext">(Apache Struts 2 
Documentation)</span>
+                    <br>
                             </div>
         
     </div>

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/model-driven-interceptor.html
----------------------------------------------------------------------
diff --git a/content/docs/model-driven-interceptor.html 
b/content/docs/model-driven-interceptor.html
index 25ac457..a354d63 100644
--- a/content/docs/model-driven-interceptor.html
+++ b/content/docs/model-driven-interceptor.html
@@ -179,7 +179,7 @@ least twice.</li></ul><p></p>
 <h2 id="ModelDrivenInterceptor-Examples">Examples</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 &lt;action name=&quot;someAction&quot; 
class=&quot;com.examples.SomeAction&quot;&gt;
     &lt;interceptor-ref name=&quot;modelDriven&quot;/&gt;
     &lt;interceptor-ref name=&quot;basicStack&quot;/&gt;

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/optgroup.html
----------------------------------------------------------------------
diff --git a/content/docs/optgroup.html b/content/docs/optgroup.html
index fa4c918..50bcfca 100644
--- a/content/docs/optgroup.html
+++ b/content/docs/optgroup.html
@@ -161,7 +161,7 @@ This component is to be used within a  Select component.
 <h2 id="optgroup-Examples">Examples</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 
 &lt;s:select label=&quot;My Selection&quot;
            name=&quot;mySelection&quot;

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/optiontransferselect.html
----------------------------------------------------------------------
diff --git a/content/docs/optiontransferselect.html 
b/content/docs/optiontransferselect.html
index 82b8bd0..1f434ed 100644
--- a/content/docs/optiontransferselect.html
+++ b/content/docs/optiontransferselect.html
@@ -172,7 +172,7 @@ and doubleId will be 
&lt;form_id&gt;_&lt;optiontransferselect_nameame&gt; and
 <h2 id="optiontransferselect-Examples">Examples</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 
 &lt;-- minimum configuration --&gt;
 &lt;s:optiontransferselect

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/param.html
----------------------------------------------------------------------
diff --git a/content/docs/param.html b/content/docs/param.html
index 9e898dc..cb12018 100644
--- a/content/docs/param.html
+++ b/content/docs/param.html
@@ -178,7 +178,7 @@ And in situation (B) the value would be evaluated to the 
stack as a <tt>java.lan
 <h1 id="param-Examples">Examples</h1>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 &lt;pre&gt;
 &lt;ui:component&gt;
  &lt;ui:param name=&quot;key&quot;     value=&quot;[0]&quot;/&gt;

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/parameter-filter-interceptor.html
----------------------------------------------------------------------
diff --git a/content/docs/parameter-filter-interceptor.html 
b/content/docs/parameter-filter-interceptor.html
index 328674e..edc4559 100644
--- a/content/docs/parameter-filter-interceptor.html
+++ b/content/docs/parameter-filter-interceptor.html
@@ -176,7 +176,7 @@ in the allowed list (the longer string determines 
permissions).</p>
 
 <h2 id="ParameterFilterInterceptor-Example">Example</h2>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: bash; gutter: false; theme: Confluence" 
style="font-size:12px;">
 &lt;interceptors&gt;
     ... 
     &lt;interceptor name="parameterFilter" 
class="com.opensymphony.xwork2.interceptor.ParameterFilterInterceptor"/&gt;

Reply via email to