http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/sitegraph-plugin.html
----------------------------------------------------------------------
diff --git a/content/docs/sitegraph-plugin.html 
b/content/docs/sitegraph-plugin.html
index f27ade6..8f269e4 100644
--- a/content/docs/sitegraph-plugin.html
+++ b/content/docs/sitegraph-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,51 +125,12 @@ 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>This plugin got marked as 
deprecated since Struts 2.5.11!</p></div></div><p>&#160;</p><p>The SiteGraph 
plugingenerates graphical diagrams representing the flow of your web 
application.</p><p>SiteGraph works by parsing your configuration files, Action 
classes, and view files (JSP, Velocity, and FreeMarker), and displaying a 
visual map.</p><p>Additional information can be found in the 
JavaDocs:</p><p></p><p>
-SiteGraph is a tool that renders out GraphViz-generated images depicting your
-Struts-powered web application's flow. SiteGraph requires GraphViz be installed
-and that the "dot" executable be in your command path. You can find GraphViz
-at http://www.graphviz.org.
-</p><h4 id="SiteGraphPlugin-UnderstandingtheOutput">Understanding the 
Output</h4><p>There are several key things to notice when looking at the output 
from SiteGraph:</p><ul><li>Boxes: those shaded red indicate an action; those 
shaded green indicate a view file (JSP, etc).</li><li>Links: arrows colored 
green imply that no new HTTP request is being made; black arrows indicate a new 
HTTP request.</li><li>Link labels: labels may sometimes contain additional 
useful information. For example, a label of <strong>href</strong> means that 
the link behavior is that of a hyper-text reference. The complete label 
behaviors are provided:<ul><li><strong>href</strong> - a view file references 
an action by name (typically ending with the extension 
".action")</li><li><strong>action</strong> - a view file makes a call to the <a 
shape="rect" href="action.html">action</a> tag</li><li><strong>form</strong> - 
a view file is linked to an action using the <a shape="rect" 
href="form.html">form</a> tag</li><li
 ><strong>redirect</strong> - an action is redirecting to another view or 
 >action</li><li><strong>! notation</strong> - a link to an action overrides 
 >the method to invoke</li></ul></li></ul><h4 
 >id="SiteGraphPlugin-Requirements">Requirements</h4><p>SiteGraph requires that 
 >your view files be structured in a very specific way. Because it has to read 
 >these files, only certain styles are supported. The requirements 
 >are:</p><ul><li>The JSP tags must use the "s" namespace.<ul><li>In JSP: 
 >&lt;s:xxx/&gt;</li><li>In FreeMarker: &lt;@s.xxx/&gt;</li><li>In Velocity: 
 >N/A</li></ul></li><li>Use of the <a shape="rect" href="form.html">form</a> 
 >tag and <a shape="rect" href="action.html">action</a> tag must be linking 
 >directly to the action name (and optional namespace). This means that 
 >&lt;s:form action="foo"/&gt; is OK, but &lt;s:form action="foo.action"/&gt; 
 >is not.<br clear="none"> Here is also a short overview of what it does and 
 >why a developer would want to use it.</li></ul><h4 id="SiteGraphPlug
 in-Features">Features</h4><ul><li>Generates a graphical view of your web 
application</li></ul><h2 id="SiteGraphPlugin-Usage">Usage</h2><p>You can use 
SiteGraph with the following command:</p><div class="code panel pdl" 
style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" 
style="font-size:12px;">java -cp ... -jar struts2-sitegraph-plugin-x.x.x.jar
+            <div id="ConfluenceContent"><rich-text-body><p>This plugin got 
marked as deprecated since Struts 
2.5.11!</p></rich-text-body><p>&#160;</p><p>The SiteGraph plugin<parameter 
ac:name="atlassian-macro-output-type">INLINE</parameter><rich-text-body><p>generates
 graphical diagrams representing the flow of your web 
application</p></rich-text-body>.</p><p>SiteGraph works by parsing your 
configuration files, Action classes, and view files (JSP, Velocity, and 
FreeMarker), and displaying a visual map.</p><p>Additional information can be 
found in the 
JavaDocs:<plain-text-body>{snippet:id=javadocs-intro|javadoc=true|url=org.apache.struts2.sitegraph.SiteGraph}</plain-text-body></p><h4
 id="SiteGraphPlugin-UnderstandingtheOutput">Understanding the 
Output</h4><p>There are several key things to notice when looking at the output 
from SiteGraph:</p><ul><li>Boxes: those shaded red indicate an action; those 
shaded green indicate a view file (JSP, etc).</li><li>Links: arrows colored 
green impl
 y that no new HTTP request is being made; black arrows indicate a new HTTP 
request.</li><li>Link labels: labels may sometimes contain additional useful 
information. For example, a label of <strong>href</strong> means that the link 
behavior is that of a hyper-text reference. The complete label behaviors are 
provided:<ul><li><strong>href</strong> - a view file references an action by 
name (typically ending with the extension 
".action")</li><li><strong>action</strong> - a view file makes a call to the <a 
shape="rect" href="action.html">action</a> tag</li><li><strong>form</strong> - 
a view file is linked to an action using the <a shape="rect" 
href="form.html">form</a> tag</li><li><strong>redirect</strong> - an action is 
redirecting to another view or action</li><li><strong>! notation</strong> - a 
link to an action overrides the method to invoke</li></ul></li></ul><h4 
id="SiteGraphPlugin-Requirements">Requirements</h4><p>SiteGraph requires that 
your view files be structured in a very spe
 cific way. Because it has to read these files, only certain styles are 
supported. The requirements are:</p><ul><li>The JSP tags must use the "s" 
namespace.<ul><li>In JSP: &lt;s:xxx/&gt;</li><li>In FreeMarker: 
&lt;@s.xxx/&gt;</li><li>In Velocity: N/A</li></ul></li><li>Use of the <a 
shape="rect" href="form.html">form</a> tag and <a shape="rect" 
href="action.html">action</a> tag must be linking directly to the action name 
(and optional namespace). This means that &lt;s:form action="foo"/&gt; is OK, 
but &lt;s:form action="foo.action"/&gt; is not.<br clear="none"> Here is also a 
short overview of what it does and why a developer would want to use 
it.</li></ul><h4 id="SiteGraphPlugin-Features">Features</h4><ul><li>Generates a 
graphical view of your web application</li></ul><h2 
id="SiteGraphPlugin-Usage">Usage</h2><p>You can use SiteGraph with the 
following command:</p><plain-text-body>java -cp ... -jar 
struts2-sitegraph-plugin-x.x.x.jar
      -config CONFIG_DIR
      -views VIEWS_DIRS
      -output OUTPUT
      [-ns NAMESPACE]
-</pre>
-</div></div><p>Where:</p><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[
-Usage: -config CONFIG_DIR -views VIEWS_DIRS -output OUTPUT [-ns NAMESPACE]
-       CONFIG_DIR =&gt; a directory containing struts.xml
-       VIEWS_DIRS =&gt; comma seperated list of dirs containing JSPs, VMs, etc
-       OUPUT      =&gt; the directory where the output should go
-       NAMESPACE  =&gt; the namespace path restriction (/, /foo, etc)
-]]></script>
-</div></div><div class="confluence-information-macro 
confluence-information-macro-warning"><span class="aui-icon aui-icon-small 
aui-iconfont-error confluence-information-macro-icon"></span><div 
class="confluence-information-macro-body"><p>You must either supply the correct 
classpath when invoking the SiteGraph tool or place the Sitegraph plugin in the 
same directory as the dependent jars. Specifically, the XWork jar, Struts jar, 
and their dependencies must be included in the classpath. Futhermore, 
<strong>you must also include your Action class files referenced in</strong> 
<code><strong>struts.xml</strong></code>. Without the proper class path 
entries, SiteGraph will not function properly.</p></div></div><p>Once you have 
run SiteGraph, check the directory specified in the "output" argument (OUTPUT). 
In there you will find two files: <strong>out.dot</strong> and 
<strong>out.gif</strong>. You may immediately open up <strong>out.gif</strong> 
and view the web application flow. However, 
 you may also wish to either run the <strong>out.dot</strong> file through a 
different GraphVis layout engine (neato, twopi, etc), so the original dot file 
is provided as well. You may also wish to edit the dot file before rendering 
the final flow diagram.</p><h4 
id="SiteGraphPlugin-AutomaticExecution">Automatic Execution</h4><p>Some 
advanced users may wish to execute SiteGraph from within their application - 
this could be required if you are developing an application that supports 
plugin capabilities. This can easily be done. See the JavaDocs for more 
info:</p><p></p><p>
-If you wish to use SiteGraph through its API rather than through the command 
line,
-you can do that as well. All you need to do is create a new SiteGraph instance,
-optionally specify a Writer to output the dot content to, and then call
-#prepare().
-</p>The command line version of SiteGraph does exactly this (except for 
overriding the Writer):<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[
-SiteGraph siteGraph = new SiteGraph(configDir, views, output, namespace);
-siteGraph.prepare();
-siteGraph.render();
-]]></script>
-</div></div><h4 id="SiteGraphPlugin-Example">Example</h4><p>
-
-    
-    
-    
-
-</p><div class="gallery">
-        <table><tr><td colspan="1" rowspan="1" class="gallery-image" 
style="width: 300px">
-                    <img class="confluence-embedded-image" border="0" 
src="sitegraph-plugin.thumbs/example.gif" width="300" height="243" 
data-image-src="/confluence/download/attachments/14137/example.gif?version=1&amp;modificationDate=1119906238000&amp;api=v2"
 data-linked-resource-default-alias="example.gif" 
data-linked-resource-id="1601" data-linked-resource-container-id="14137">
-                </td></tr><tr><td colspan="1" rowspan="1" style="width: 300px">
-                    <div class="gallery-caption"></div>
-                </td></tr></table>
-</div>
-<h4 id="SiteGraphPlugin-Settings">Settings</h4><p>This plugin doesn't allow 
for any global settings.</p><h4 
id="SiteGraphPlugin-Installation">Installation</h4><p>The SiteGraph plugin jar 
is distributed with Struts, so if you're up and running, you don't need to do 
download any additional Java packages. However, SiteGraph does require the 
"dot" package by <a shape="rect" class="external-link" 
href="http://www.graphviz.org"; rel="nofollow">GraphViz</a>.</p><p>You'll need 
to download the latest version of GraphViz and make sure that the dot 
executable (dot.exe in Windows) is in your command path. In Windows the 
GraphViz installer typically automatically adds <code>dot.exe</code> to your 
path. However, you may need to do this by hand depending on your system 
configuration.</p></div>
+</plain-text-body><p>Where:<plain-text-body>{snippet:id=sitegraph-usage|lang=none|url=struts2/plugins/sitegraph/src/main/resources/org/apache/struts2/sitegraph/sitegraph-usage.txt}</plain-text-body></p><rich-text-body><p>You
 must either supply the correct classpath when invoking the SiteGraph tool or 
place the Sitegraph plugin in the same directory as the dependent jars. 
Specifically, the XWork jar, Struts jar, and their dependencies must be 
included in the classpath. Futhermore, <strong>you must also include your 
Action class files referenced in</strong> 
<code><strong>struts.xml</strong></code>. Without the proper class path 
entries, SiteGraph will not function properly.</p></rich-text-body><p>Once you 
have run SiteGraph, check the directory specified in the "output" argument 
(OUTPUT). In there you will find two files: <strong>out.dot</strong> and 
<strong>out.gif</strong>. You may immediately open up <strong>out.gif</strong> 
and view the web application flow. However, you may also 
 wish to either run the <strong>out.dot</strong> file through a different 
GraphVis layout engine (neato, twopi, etc), so the original dot file is 
provided as well. You may also wish to edit the dot file before rendering the 
final flow diagram.</p><h4 id="SiteGraphPlugin-AutomaticExecution">Automatic 
Execution</h4><p>Some advanced users may wish to execute SiteGraph from within 
their application - this could be required if you are developing an application 
that supports plugin capabilities. This can easily be done. See the JavaDocs 
for more 
info:<plain-text-body>{snippet:id=javadocs-api|javadoc=true|url=org.apache.struts2.sitegraph.SiteGraph}</plain-text-body>The
 command line version of SiteGraph does exactly this (except for overriding the 
Writer):<plain-text-body>{snippet:id=example-api|javadoc=true|lang=java|url=org.apache.struts2.sitegraph.SiteGraph}</plain-text-body></p><h4
 id="SiteGraphPlugin-Example">Example</h4><p></p><h4 
id="SiteGraphPlugin-Settings">Settings</h4><p>This plug
 in doesn't allow for any global settings.</p><h4 
id="SiteGraphPlugin-Installation">Installation</h4><p>The SiteGraph plugin jar 
is distributed with Struts, so if you're up and running, you don't need to do 
download any additional Java packages. However, SiteGraph does require the 
"dot" package by <a shape="rect" class="external-link" 
href="http://www.graphviz.org"; rel="nofollow">GraphViz</a>.</p><p>You'll need 
to download the latest version of GraphViz and make sure that the dot 
executable (dot.exe in Windows) is in your command path. In Windows the 
GraphViz installer typically automatically adds <code>dot.exe</code> to your 
path. However, you may need to do this by hand depending on your system 
configuration.</p></div>
         </div>
 
         

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/sort.html
----------------------------------------------------------------------
diff --git a/content/docs/sort.html b/content/docs/sort.html
index 89f8d4b..1e48906 100644
--- a/content/docs/sort.html
+++ b/content/docs/sort.html
@@ -159,7 +159,7 @@ pushed into the stack and poped at the end of this tag.</p>
 <h2 id="sort-Examples">Examples</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 
 USAGE 1:
 &lt;s:sort comparator=&quot;myComparator&quot; source=&quot;myList&quot;&gt;

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/static-parameters-interceptor.html
----------------------------------------------------------------------
diff --git a/content/docs/static-parameters-interceptor.html 
b/content/docs/static-parameters-interceptor.html
index 1acf049..2411f35 100644
--- a/content/docs/static-parameters-interceptor.html
+++ b/content/docs/static-parameters-interceptor.html
@@ -162,7 +162,7 @@ The static params will be added to the request params map, 
unless "merge" is set
 <h2 id="StaticParametersInterceptor-Examples">Examples</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: 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;staticParams&quot;&gt;
          &lt;param name=&quot;parse&quot;&gt;true&lt;/param&gt;

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/stream-result.html
----------------------------------------------------------------------
diff --git a/content/docs/stream-result.html b/content/docs/stream-result.html
index dc7f4e9..d51bc42 100644
--- a/content/docs/stream-result.html
+++ b/content/docs/stream-result.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,10 +125,7 @@ under the License.
 
     <div class="pagecontent">
         <div class="wiki-content">
-            <div id="ConfluenceContent"><p>A custom Result type for sending 
raw data (via an InputStream) directly to the&#160;HttpServletResponse. Very 
useful for allowing users to download content.</p><div 
class="confluence-information-macro confluence-information-macro-note"><span 
class="aui-icon aui-icon-small aui-iconfont-warning 
confluence-information-macro-icon"></span><div 
class="confluence-information-macro-body"><p>If you are running your app server 
under HTTPS and having issues with PDF's or other file streams you should take 
a look at <a shape="rect" href="https-and-ie-issues.html">HTTPS and IE 
Issues</a></p></div></div><h1 id="StreamResult-Parameters">Parameters</h1><ul 
style="list-style-type: square;"><li><span style="line-height: 
1.42857;"><strong>contentType</strong>&#160;- the stream mime-type as sent to 
the web browser&#160;</span>(default = 
<code>text/plain</code>).</li><li><strong>contentLength</strong> - the stream 
length in bytes (the browser displays a&#160;pr
 ogress bar).</li><li><strong>contentDisposition</strong>&#160;- the content 
disposition header value for&#160;specifying the file name (default = 
<code>inline</code>, values are 
typically&#160;<em>attachment;filename="document.pdf"</em>.</li><li><strong>inputName&#160;</strong>-
 the name of the InputStream property from the chained&#160;action (default = 
<strong>inputStream</strong>).</li><li><strong>bufferSize&#160;</strong>- the 
size of the buffer to copy from input to output&#160;(default = 
<code>1024</code>).</li><li><strong>allowCaching</strong>&#160;- if set to 
'false' it will set the headers <code>Pragma</code>&#160;and 
<code>Cache-Control</code>&#160;to <code>no-cahce</code>, and prevent client 
from caching the content (default = 
<code>true</code>).</li><li><strong>contentCharSet</strong> -&#160;if set to a 
string, ';charset=value' will be added to the&#160;content-type header, where 
value is the string set. If set to an expression, the result&#160;of evaluating 
the expressi
 on will be used. If not set, then no charset will be set on&#160;the 
header</li></ul><p>These parameters can also be set by exposing a similarly 
named getter method on your Action. For example, you can&#160;provide 
<code>getContentType()</code>&#160;to override that parameter for the current 
action. To do it you you must explicitly define this param as an expression 
i.e.</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeHeader panelHeader pdl" style="border-bottom-width: 
1px;"><b>parameter defined as an expression</b></div><div class="codeContent 
panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" 
style="font-size:12px;">&lt;param 
name="contentType"&gt;${contentType}&lt;/param&gt;</pre>
-</div></div><div class="confluence-information-macro 
confluence-information-macro-note"><span class="aui-icon aui-icon-small 
aui-iconfont-warning confluence-information-macro-icon"></span><div 
class="confluence-information-macro-body"><p>Please be aware that this was 
changed since Struts 2.5.2, previously each parameter was automagically 
resolved by looking throughout the <code>ValueStack</code>, now you must 
explicitly define wich parameter must be evaluated, even 
<code>inputName</code>.</p></div></div><h1 
id="StreamResult-Examples">Examples</h1><h2 
id="StreamResult-AnnotationbasedConfiguration">Annotation based 
Configuration</h2><p>To configure Actions and Results with Annotations you need 
to activate the Struts2 <a shape="rect" 
href="convention-plugin.html">Convention Plugin</a> in your Struts2 
application.</p><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" 
style="font-size:12px;">package com.mycompany.webapp.actions;
+            <div id="ConfluenceContent"><p>A custom Result type for sending 
raw data (via an InputStream) directly to the&#160;HttpServletResponse. Very 
useful for allowing users to download content.</p><rich-text-body><p>If you are 
running your app server under HTTPS and having issues with PDF's or other file 
streams you should take a look at <a shape="rect" 
href="https-and-ie-issues.html">HTTPS and IE Issues</a></p></rich-text-body><h1 
id="StreamResult-Parameters">Parameters</h1><ul style="list-style-type: 
square;"><li><span style="line-height: 
1.42857;"><strong>contentType</strong>&#160;- the stream mime-type as sent to 
the web browser&#160;</span>(default = 
<code>text/plain</code>).</li><li><strong>contentLength</strong> - the stream 
length in bytes (the browser displays a&#160;progress 
bar).</li><li><strong>contentDisposition</strong>&#160;- the content 
disposition header value for&#160;specifying the file name (default = 
<code>inline</code>, values are typically&#160;<em>attac
 hment;filename="document.pdf"</em>.</li><li><strong>inputName&#160;</strong>- 
the name of the InputStream property from the chained&#160;action (default = 
<strong>inputStream</strong>).</li><li><strong>bufferSize&#160;</strong>- the 
size of the buffer to copy from input to output&#160;(default = 
<code>1024</code>).</li><li><strong>allowCaching</strong>&#160;- if set to 
'false' it will set the headers <code>Pragma</code>&#160;and 
<code>Cache-Control</code>&#160;to <code>no-cahce</code>, and prevent client 
from caching the content (default = 
<code>true</code>).</li><li><strong>contentCharSet</strong> -&#160;if set to a 
string, ';charset=value' will be added to the&#160;content-type header, where 
value is the string set. If set to an expression, the result&#160;of evaluating 
the expression will be used. If not set, then no charset will be set 
on&#160;the header</li></ul><p>These parameters can also be set by exposing a 
similarly named getter method on your Action. For example, you can&
 #160;provide <code>getContentType()</code>&#160;to override that parameter for 
the current action. To do it you you must explicitly define this param as an 
expression i.e.</p><parameter ac:name="language">xml</parameter><parameter 
ac:name="title">parameter defined as an 
expression</parameter><plain-text-body>&lt;param 
name="contentType"&gt;${contentType}&lt;/param&gt;</plain-text-body><rich-text-body><p>Please
 be aware that this was changed since Struts 2.5.2, previously each parameter 
was automagically resolved by looking throughout the <code>ValueStack</code>, 
now you must explicitly define wich parameter must be evaluated, even 
<code>inputName</code>.</p></rich-text-body><h1 
id="StreamResult-Examples">Examples</h1><h2 
id="StreamResult-AnnotationbasedConfiguration">Annotation based 
Configuration</h2><p>To configure Actions and Results with Annotations you need 
to activate the Struts2 <a shape="rect" 
href="convention-plugin.html">Convention Plugin</a> in your Struts2 
application.</
 p><parameter ac:name="language">java</parameter><plain-text-body>package 
com.mycompany.webapp.actions;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -190,15 +173,12 @@ public class FileDisplay extends ActionSupport {
                return this.stream;
        }
 }
-</pre>
-</div></div><h2 id="StreamResult-XMLbasedConfiguration">XML based 
Configuration</h2><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Example 
configuration</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" 
style="font-size:12px;">&lt;result name="success" type="stream"&gt;
+</plain-text-body><h2 id="StreamResult-XMLbasedConfiguration">XML based 
Configuration</h2><parameter ac:name="language">java</parameter><parameter 
ac:name="title">Example configuration</parameter><plain-text-body>&lt;result 
name="success" type="stream"&gt;
   &lt;param name="contentType"&gt;image/jpeg&lt;/param&gt;
   &lt;param name="inputName"&gt;${imageStream}&lt;/param&gt;
   &lt;param 
name="contentDisposition"&gt;attachment;filename="document.pdf"&lt;/param&gt;
   &lt;param name="bufferSize"&gt;1024&lt;/param&gt;
-&lt;/result&gt;</pre>
-</div></div></div>
+&lt;/result&gt;</plain-text-body></div>
         </div>
 
                     <div class="tabletitle">

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/stringlength-validator.html
----------------------------------------------------------------------
diff --git a/content/docs/stringlength-validator.html 
b/content/docs/stringlength-validator.html
index afc5bb8..5a57f92 100644
--- a/content/docs/stringlength-validator.html
+++ b/content/docs/stringlength-validator.html
@@ -154,7 +154,7 @@ String before performing the length check.  If unspecified, 
the String will be t
 
 <h1 id="stringlengthvalidator-Examples">Examples</h1>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 &lt;validators&gt;
     &lt;!-- Plain Validator Syntax --&gt;
     &lt;validator type=&quot;stringlength&quot;&gt;

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/stringlengthfieldvalidator-annotation.html
----------------------------------------------------------------------
diff --git a/content/docs/stringlengthfieldvalidator-annotation.html 
b/content/docs/stringlengthfieldvalidator-annotation.html
index f42541e..c57fff3 100644
--- a/content/docs/stringlengthfieldvalidator-annotation.html
+++ b/content/docs/stringlengthfieldvalidator-annotation.html
@@ -156,7 +156,7 @@ If neither minLength nor maxLength is set, nothing will be 
done.</p>
 <h2 id="StringLengthFieldValidatorAnnotation-Examples">Examples</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 @StringLengthFieldValidator(message = &quot;Default message&quot;, key = 
&quot;i18n.key&quot;, shortCircuit = true, trim = true, minLength = 
&quot;5&quot;,  maxLength = &quot;12&quot;)
 ]]></script>
 </div></div></div>

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/struts-1-plugin.html
----------------------------------------------------------------------
diff --git a/content/docs/struts-1-plugin.html 
b/content/docs/struts-1-plugin.html
index 8fa4a48..d352b74 100644
--- a/content/docs/struts-1-plugin.html
+++ b/content/docs/struts-1-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,16 +125,16 @@ under the License.
 
     <div class="pagecontent">
         <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The Struts 1 plugin allows you to 
use existing Struts 1 Actions and ActionForms in Struts 2 applications.</p>
+            <div id="ConfluenceContent"><p>The Struts 1 plugin <parameter 
ac:name="atlassian-macro-output-type">INLINE</parameter><rich-text-body><p>allows
 you to use existing Struts 1 Actions and ActionForms in Struts 2 
applications</p></rich-text-body>.</p>
 
 <p>This plugin provides a generic Struts 2 Action class to wrap an existing 
Struts 1 Action, <code>org.apache.struts2.s1.Struts1Action</code>.  The wrapper 
class provides the expected calls to the legacy Struts 1 Action and ActionForm, 
converting incoming and outgoing objects into the expected forms.  It works by 
using the <a shape="rect" href="scoped-model-driven-interceptor.html">scoped 
model driven</a> technique that uses a single Object as the model for every 
page, very similar to how the Struts 1 ActionForm works.  The plugin also 
provides several interceptors to emulate Struts 1 logic:</p>
 <ul><li><code>org.apache.struts2.s1.ActionFormValidatorInterceptor</code> - 
Integrates the validation of ActionForms into the workflow of Struts 
2</li><li><code>org.apache.struts2.s1.ActionFormResetInterceptor</code> - Calls 
the <code>reset()</code> method on any discovered ActionForms</li></ul>
 
 
-<div class="confluence-information-macro 
confluence-information-macro-warning"><p class="title">Warning</p><span 
class="aui-icon aui-icon-small aui-iconfont-error 
confluence-information-macro-icon"></span><div 
class="confluence-information-macro-body">
+<parameter ac:name="title">Warning</parameter><rich-text-body>
 <p>The Struts 1 plugin is currently only intended to allow you to run Strust 1 
actions inside a Struts 2 application. It DOES NOT allow you to continue to use 
the Struts 1 tag libraries in your JSPs. Your JSPs must be converted to use the 
Struts 2 tag library.</p>
 
-<p>There is a <a shape="rect" class="external-link" 
href="https://issues.apache.org/struts/browse/WW-2157";>JIRA ticket</a> open for 
enhancing this plugin to allow a more seamless transition from Struts 1 to 
Struts 2 by supporting continued use of the Struts 1 tag libraries in JSPs, 
however, there is not a scheduled time frame for that functionality to be made 
available. (Patches are welcomed!) </p></div></div>
+<p>There is a <a shape="rect" class="external-link" 
href="https://issues.apache.org/struts/browse/WW-2157";>JIRA ticket</a> open for 
enhancing this plugin to allow a more seamless transition from Struts 1 to 
Struts 2 by supporting continued use of the Struts 1 tag libraries in JSPs, 
however, there is not a scheduled time frame for that functionality to be made 
available. (Patches are welcomed!) </p></rich-text-body>
 
 <h2 id="Struts1Plugin-Features">Features</h2>
 
@@ -161,19 +147,16 @@ under the License.
 
 <p>In the most simple case, where you have a Struts 1 Action that you want to 
use in Struts 2, configure a Struts 2 action using the wrapper:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader 
panelHeader pdl" style="border-bottom-width: 1px;"><b>Simple Struts 1 
configuration</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
+<parameter ac:name="title">Simple Struts 1 configuration</parameter><parameter 
ac:name="lang">xml</parameter><plain-text-body>
 &lt;action name="myAction" class="org.apache.struts2.s1.Struts1Action"&gt;
   &lt;param name="className"&gt;com.mycompany.myapp.MyAction&lt;/param&gt;
   &lt;result&gt;myAction.jsp&lt;/result&gt;
 &lt;/action&gt;
-</pre>
-</div></div>
+</plain-text-body>
 
 <p>Most likely, you will have an ActionForm that your Struts 1 Action expects. 
 To use an ActionForm, the setup is a little more complicated because you'll 
need an interceptor that manages the creation and scope (to support request and 
session scoping like Struts 1) of the ActionForm. </p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader 
panelHeader pdl" style="border-bottom-width: 1px;"><b>Struts 1 Action with a 
session-scoped ActionForm</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
+<parameter ac:name="title">Struts 1 Action with a session-scoped 
ActionForm</parameter><parameter ac:name="lang">xml</parameter><plain-text-body>
 
 &lt;action name="myFormAction" class="org.apache.struts2.s1.Struts1Action"&gt;
   &lt;param name="className"&gt;com.mycompany.myapp.MyAction&lt;/param&gt;
@@ -187,14 +170,13 @@ under the License.
 
   &lt;result&gt;myAction.jsp&lt;/result&gt;
 &lt;/action&gt;
-</pre>
-</div></div>
+</plain-text-body>
 
 <h2 id="Struts1Plugin-Example">Example</h2>
 
 <p>This example shows a few Struts 1 Actions, a session-scoped ActionForm, and 
validation that uses Commons Validator:</p>
 
-<div class="error"><span class="error">Error formatting macro: snippet: 
java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+<plain-text-body>{snippet:url=struts2/apps/showcase/src/main/resources/struts-integration.xml|lang=xml}</plain-text-body>
 
 <h2 id="Struts1Plugin-Settings">Settings</h2>
 

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/struts-defaultxml.html
----------------------------------------------------------------------
diff --git a/content/docs/struts-defaultxml.html 
b/content/docs/struts-defaultxml.html
index b2e17bb..088d64d 100644
--- a/content/docs/struts-defaultxml.html
+++ b/content/docs/struts-defaultxml.html
@@ -140,7 +140,7 @@ under the License.
     <div class="pagecontent">
         <div class="wiki-content">
             <div id="ConfluenceContent"><p>A base configuration file named 
<code>struts-default.xml</code> is included in the <code>struts2.jar</code> 
file. This file is automatically included into <code>struts.xml</code> file to 
provide the standard configuration settings without having to copy 
them.</p><div class="confluence-information-macro 
confluence-information-macro-tip"><span class="aui-icon aui-icon-small 
aui-iconfont-approve confluence-information-macro-icon"></span><div 
class="confluence-information-macro-body"><p>To exclude the 
<code>struts-default.xml</code> or to provide your own version, see the 
<code>struts.configuration.files</code> setting in <a shape="rect" 
href="strutsproperties.html">struts.properties</a>.</p></div></div><p>The 
contents of struts-default.xml are here:</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;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;
 &lt;!--
 /*

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/strutsproperties.html
----------------------------------------------------------------------
diff --git a/content/docs/strutsproperties.html 
b/content/docs/strutsproperties.html
index bae3f7a..af45816 100644
--- a/content/docs/strutsproperties.html
+++ b/content/docs/strutsproperties.html
@@ -146,7 +146,7 @@ under the License.
 <p>The list of properties can be found in 
<code>struts-default.properties</code> (inside <code>struts2.jar</code>).</p>
 <div class="panel" style="border-width: 1px;"><div class="panelHeader" 
style="border-bottom-width: 1px;"><b>struts-default.properties</b></div><div 
class="panelContent">
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: plain; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: plain; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 
 ### Struts default properties
 ###(can be overridden by a struts.properties file in the root of the classpath)

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/strutsxml-examples.html
----------------------------------------------------------------------
diff --git a/content/docs/strutsxml-examples.html 
b/content/docs/strutsxml-examples.html
index 58b1c99..0af3496 100644
--- a/content/docs/strutsxml-examples.html
+++ b/content/docs/strutsxml-examples.html
@@ -143,7 +143,7 @@ under the License.
 
 <div class="panel" style="border-width: 1px;"><div class="panelHeader" 
style="border-bottom-width: 1px;"><b>struts.xml</b></div><div 
class="panelContent">
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 
 &lt;struts&gt;
     &lt;package name=&quot;person&quot; extends=&quot;struts-default&quot; 
namespace=&quot;/person&quot; /&gt;
@@ -158,7 +158,7 @@ under the License.
 
 <div class="panel" style="border-width: 1px;"><div class="panelHeader" 
style="border-bottom-width: 1px;"><b>Struts 2.3 DTD</b></div><div 
class="panelContent">
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 
 &lt;!--
    Struts configuration DTD.

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/subset.html
----------------------------------------------------------------------
diff --git a/content/docs/subset.html b/content/docs/subset.html
index b3faaf9..5174495 100644
--- a/content/docs/subset.html
+++ b/content/docs/subset.html
@@ -154,7 +154,7 @@ perform the subset functionality.</p>
 <h2 id="subset-Examples">Examples</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: java; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: java; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 public class MySubsetTagAction extends ActionSupport {
      public String execute() throws Exception {
         l = new ArrayList();
@@ -187,7 +187,7 @@ public class MySubsetTagAction 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: List basic --&gt;
    &lt;s:subset source=&quot;myList&quot;&gt;
       &lt;s:iterator&gt;
@@ -197,7 +197,7 @@ public class MySubsetTagAction 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;!-- B: List with count --&gt;
    &lt;s:subset source=&quot;myList&quot; count=&quot;3&quot;&gt;
       &lt;s:iterator&gt;
@@ -207,7 +207,7 @@ public class MySubsetTagAction 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;!--  C: List with start --&gt;
      &lt;s:subset source=&quot;myList&quot; count=&quot;13&quot; 
start=&quot;3&quot;&gt;
         &lt;s:iterator&gt;
@@ -217,7 +217,7 @@ public class MySubsetTagAction 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;!--  D: List with var --&gt;
      &lt;s:subset var=&quot;mySubset&quot; source=&quot;myList&quot; 
count=&quot;13&quot; start=&quot;3&quot; /&gt;
      &lt;%
@@ -229,7 +229,7 @@ public class MySubsetTagAction 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;!--  D: List with Decider --&gt;
     &lt;s:subset source=&quot;myList&quot; decider=&quot;myDecider&quot;&gt;
            &lt;s:iterator&gt;

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/text.html
----------------------------------------------------------------------
diff --git a/content/docs/text.html b/content/docs/text.html
index b901366..7eeaa16 100644
--- a/content/docs/text.html
+++ b/content/docs/text.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,72 +125,30 @@ under the License.
 
     <div class="pagecontent">
         <div class="wiki-content">
-            <div id="ConfluenceContent"><div 
class="confluence-information-macro confluence-information-macro-note"><span 
class="aui-icon aui-icon-small aui-iconfont-warning 
confluence-information-macro-icon"></span><div 
class="confluence-information-macro-body"><p>Please make sure you have read the 
<a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand 
how tag attribute syntax works.</p></div></div>
+            <div id="ConfluenceContent"><rich-text-body><p>Please make sure 
you have read the <a shape="rect" href="tag-syntax.html">Tag Syntax</a> 
document and understand how tag attribute syntax works.</p></rich-text-body>
 
 <h2 id="text-Description">Description</h2>
 
-<p></p><p>
-Render a I18n text message.
-</p>
-
-<p></p><p>
-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.
-</p>
-
-<p></p><p>
-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.
-</p>
+<plain-text-body>{snippet:id=javadoc|javadoc=true|url=org.apache.struts2.components.Text}</plain-text-body>
 
 <p>For more details on using resource bundles with Struts 2 read the <a 
shape="rect" href="localization.html">localization guide</a>.</p>
 
 <h2 id="text-Parameters">Parameters</h2>
 
-<p><table width="100%"><tr><td colspan="6" rowspan="1"><h4>Dynamic Attributes 
Allowed:</h4> false</td></tr><tr><td colspan="6" 
rowspan="1">&#160;</td></tr><tr><th align="left" colspan="1" rowspan="1" 
valign="top"><h4>Name</h4></th><th align="left" colspan="1" rowspan="1" 
valign="top"><h4>Required</h4></th><th align="left" colspan="1" rowspan="1" 
valign="top"><h4>Default</h4></th><th align="left" colspan="1" rowspan="1" 
valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" rowspan="1" 
valign="top"><h4>Type</h4></th><th align="left" colspan="1" rowspan="1" 
valign="top"><h4>Description</h4></th></tr><tr><td align="left" colspan="1" 
rowspan="1" valign="top">name</td><td align="left" colspan="1" rowspan="1" 
valign="top"><strong>true</strong></td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" valign
 ="top">Name of resource property to fetch</td></tr><tr><td align="left" 
colspan="1" rowspan="1" valign="top">searchValueStack</td><td align="left" 
colspan="1" rowspan="1" valign="top">false</td><td align="left" colspan="1" 
rowspan="1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">Boolean</td><td align="left" colspan="1" rowspan="1" 
valign="top">Search the stack if property is not found on 
resources</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">var</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Name used to reference the value pushed into the Value 
Stack</td></tr></table></p>
+<plain-text-body>{snippet:id=tagattributes|javadoc=false|url=struts2-tags/text.html}</plain-text-body>
 
 <h2 id="text-Examples">Examples</h2>
 
-<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[
-&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;
-]]></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[
-
-&lt;!-- First Example --&gt;
-&lt;s:i18n name=&quot;struts.action.test.i18n.Shop&quot;&gt;
-    &lt;s:text name=&quot;main.title&quot;/&gt;
-&lt;/s:i18n&gt;
-
-&lt;!-- Second Example --&gt;
-&lt;s:text name=&quot;main.title&quot; /&gt;
-
-&lt;!-- Third Examlpe --&gt;
-&lt;s:text name=&quot;i18n.label.greetings&quot;&gt;
-   &lt;s:param &gt;Mr Smith&lt;/s:param&gt;
-&lt;/s:text&gt;
-
-]]></script>
-</div></div>
+<plain-text-body>{snippet:id=exdescription|lang=none|javadoc=true|url=org.apache.struts2.components.Text}</plain-text-body>
+<plain-text-body>{snippet:id=example|lang=xml|javadoc=true|url=org.apache.struts2.components.Text}</plain-text-body>
 <p>Other example</p>
-<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;">
+<parameter ac:name="">xml</parameter><plain-text-body>
 &lt;s:text name="format.money"&gt;&lt;s:param name="value" 
value="myMoneyValue"/&gt;&lt;/s:text&gt;
-</pre>
-</div></div>
+</plain-text-body>
 <p>where the following is in a regular (possibly locale-specific) properties 
file:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" 
style="font-size:12px;">
+<plain-text-body>
 format.money={0,number,currency}
-</pre>
-</div></div>
+</plain-text-body>
 
 <p>For more about formatting text, see</p>
 <ol><li><a shape="rect" class="external-link" 
href="http://java.sun.com/j2se/1.4.2/docs/api/java/text/MessageFormat.html"; 
rel="nofollow">http://java.sun.com/j2se/1.4.2/docs/api/java/text/MessageFormat.html</a></li><li><a
 shape="rect" class="external-link" 
href="http://java.sun.com/docs/books/tutorial/i18n/format/decimalFormat.html"; 
rel="nofollow">http://java.sun.com/docs/books/tutorial/i18n/format/decimalFormat.html</a></li></ol>
@@ -212,17 +156,13 @@ format.money={0,number,currency}
 
 <h2 id="text-Ifyouwishtousei18ninyourtagattributes">If you wish to use i18n in 
your tag attributes</h2>
 <p>This will <strong>not</strong> work:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">
+<parameter ac:name="">xml</parameter><plain-text-body>
 &lt;s:textfield name="lastName" label="&lt;s:text name="person.lastName"/&gt;" 
../&gt;
-</pre>
-</div></div>
+</plain-text-body>
 <p>Instead, you should use the getText() method that you inherit when your 
Action extends XWork's ActionSupport:</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;">
+<parameter ac:name="">xml</parameter><plain-text-body>
 &lt;s:textfield name="lastName" label="getText('person.lastName')" ../&gt;
-</pre>
-</div></div></div>
+</plain-text-body></div>
         </div>
 
         

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/textarea.html
----------------------------------------------------------------------
diff --git a/content/docs/textarea.html b/content/docs/textarea.html
index d09ec01..ce5e838 100644
--- a/content/docs/textarea.html
+++ b/content/docs/textarea.html
@@ -152,7 +152,7 @@ under the License.
 <h2 id="textarea-Example">Example</h2>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 &lt;s:textarea label=&quot;Comments&quot; name=&quot;comments&quot; 
cols=&quot;30&quot; rows=&quot;8&quot;/&gt;
 ]]></script>
 </div></div></div>

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b16cc4ef/content/docs/textfield.html
----------------------------------------------------------------------
diff --git a/content/docs/textfield.html b/content/docs/textfield.html
index 2756697..eaa2488 100644
--- a/content/docs/textfield.html
+++ b/content/docs/textfield.html
@@ -140,11 +140,11 @@ under the License.
     <div class="pagecontent">
         <div class="wiki-content">
             <div id="ConfluenceContent"><div 
class="confluence-information-macro confluence-information-macro-note"><span 
class="aui-icon aui-icon-small aui-iconfont-warning 
confluence-information-macro-icon"></span><div 
class="confluence-information-macro-body"><p>Please make sure you have read the 
<a shape="rect" href="tag-syntax.html">Tag Syntax</a> document and understand 
how tag attribute syntax works.</p></div></div><h2 
id="textfield-Description">Description</h2><p></p><p></p><p>Render an HTML 
input field of type text</p><h2 
id="textfield-Parameters">Parameters</h2><p></p><p><table width="100%"><tr><td 
colspan="6" rowspan="1"><h4>Dynamic Attributes Allowed:</h4> 
true</td></tr><tr><td colspan="6" rowspan="1">&#160;</td></tr><tr><th 
align="left" colspan="1" rowspan="1" valign="top"><h4>Name</h4></th><th 
align="left" colspan="1" rowspan="1" valign="top"><h4>Required</h4></th><th 
align="left" colspan="1" rowspan="1" valign="top"><h4>Default</h4></th><th 
align="left" colspan="1" ro
 wspan="1" valign="top"><h4>Evaluated</h4></th><th align="left" colspan="1" 
rowspan="1" valign="top"><h4>Type</h4></th><th align="left" colspan="1" 
rowspan="1" valign="top"><h4>Description</h4></th></tr><tr><td align="left" 
colspan="1" rowspan="1" valign="top">accesskey</td><td align="left" colspan="1" 
rowspan="1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html accesskey attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">class</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" r
 owspan="1" valign="top">The css class to use for element - it's an alias of 
cssClass attribute.</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">cssClass</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">The css class to use for element</td></tr><tr><td align="left" 
colspan="1" rowspan="1" valign="top">cssErrorClass</td><td align="left" 
colspan="1" rowspan="1" valign="top">false</td><td align="left" colspan="1" 
rowspan="1" valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">The css error class to use for element</td></tr><tr><td 
align="left" colspan="1" rowspan="1
 " valign="top">cssErrorStyle</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">The css error style definitions for element to 
use</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">cssStyle</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">The css style definitions for element to use</td></tr><tr><td 
align="left" colspan="1" rowspan="1" valign="top">disabled</td><td align="left" 
colspan="1" rowspan="1" valign="top">false</td><td align="left" colspan="1" row
 span="1" valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html disabled attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">errorPosition</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Define error position of form element 
(top|bottom)</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">id</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1
 " rowspan="1" valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">HTML id attribute</td></tr><tr><td align="left" colspan="1" 
rowspan="1" valign="top">javascriptTooltip</td><td align="left" colspan="1" 
rowspan="1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">Boolean</td><td align="left" colspan="1" rowspan="1" 
valign="top">Use JavaScript to generate tooltips</td></tr><tr><td align="left" 
colspan="1" rowspan="1" valign="top">key</td><td align="left" colspan="1" 
rowspan="1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the key (name, value, label) for this particular 
component</td></
 tr><tr><td align="left" colspan="1" rowspan="1" valign="top">label</td><td 
align="left" colspan="1" rowspan="1" valign="top">false</td><td align="left" 
colspan="1" rowspan="1" valign="top"></td><td align="left" colspan="1" 
rowspan="1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Label expression used for rendering an element specific 
label</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">labelSeparator</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">:</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">String that will be appended to the label</td></tr><tr><td 
align="left" colspan="1" rowspan="1" valign="top">labelposition</td><td 
align="left" colspan="1" rowspan="
 1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Define label position of form element (top/left)</td></tr><tr><td 
align="left" colspan="1" rowspan="1" valign="top">maxLength</td><td 
align="left" colspan="1" rowspan="1" valign="top">false</td><td align="left" 
colspan="1" rowspan="1" valign="top"></td><td align="left" colspan="1" 
rowspan="1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">Integer</td><td align="left" colspan="1" rowspan="1" 
valign="top">Deprecated. Use maxlength instead.</td></tr><tr><td align="left" 
colspan="1" rowspan="1" valign="top">maxlength</td><td align="left" colspan="1" 
rowspan="1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" valign="top"
 >false</td><td align="left" colspan="1" rowspan="1" 
 >valign="top">Integer</td><td align="left" colspan="1" rowspan="1" 
 >valign="top">HTML maxlength attribute</td></tr><tr><td align="left" 
 >colspan="1" rowspan="1" valign="top">name</td><td align="left" colspan="1" 
 >rowspan="1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
 >valign="top"></td><td align="left" colspan="1" rowspan="1" 
 >valign="top">false</td><td align="left" colspan="1" rowspan="1" 
 >valign="top">String</td><td align="left" colspan="1" rowspan="1" 
 >valign="top">The name to set for element</td></tr><tr><td align="left" 
 >colspan="1" rowspan="1" valign="top">onblur</td><td align="left" colspan="1" 
 >rowspan="1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
 >valign="top"></td><td align="left" colspan="1" rowspan="1" 
 >valign="top">false</td><td align="left" colspan="1" rowspan="1" 
 >valign="top">String</td><td align="left" colspan="1" rowspan="1" 
 >valign="top"> Set the html onblur attribute on rendered html
  element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">onchange</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html onchange attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">onclick</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html onclick attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">ondblclick</td><td align="left" colsp
 an="1" rowspan="1" valign="top">false</td><td align="left" colspan="1" 
rowspan="1" valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html ondblclick attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">onfocus</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html onfocus attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">onkeydown</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align
 ="left" colspan="1" rowspan="1" valign="top">false</td><td align="left" 
colspan="1" rowspan="1" valign="top">String</td><td align="left" colspan="1" 
rowspan="1" valign="top">Set the html onkeydown attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">onkeypress</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html onkeypress attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">onkeyup</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" valign="top
 ">String</td><td align="left" colspan="1" rowspan="1" valign="top">Set the 
html onkeyup attribute on rendered html element</td></tr><tr><td align="left" 
colspan="1" rowspan="1" valign="top">onmousedown</td><td align="left" 
colspan="1" rowspan="1" valign="top">false</td><td align="left" colspan="1" 
rowspan="1" valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html onmousedown attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">onmousemove</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html onmousemove attribute o
 n rendered html element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">onmouseout</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html onmouseout attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">onmouseover</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html onmouseover attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">onmouseup<
 /td><td align="left" colspan="1" rowspan="1" valign="top">false</td><td 
align="left" colspan="1" rowspan="1" valign="top"></td><td align="left" 
colspan="1" rowspan="1" valign="top">false</td><td align="left" colspan="1" 
rowspan="1" valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html onmouseup attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">onselect</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html onselect attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">readonly</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" v
 align="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">Boolean</td><td align="left" colspan="1" rowspan="1" 
valign="top">Whether the input is readonly</td></tr><tr><td align="left" 
colspan="1" rowspan="1" valign="top">requiredLabel</td><td align="left" 
colspan="1" rowspan="1" valign="top">false</td><td align="left" colspan="1" 
rowspan="1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">Boolean</td><td align="left" colspan="1" rowspan="1" 
valign="top">If set to true, the rendered element will indicate that input is 
required</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">requiredPosition</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left
 " colspan="1" rowspan="1" valign="top">String</td><td align="left" colspan="1" 
rowspan="1" valign="top">Define required position of required form element 
(left|right)</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">size</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">Integer</td><td align="left" colspan="1" rowspan="1" 
valign="top">HTML size attribute</td></tr><tr><td align="left" colspan="1" 
rowspan="1" valign="top">style</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">The css style definitions for element to use
  - it's an alias of cssStyle attribute.</td></tr><tr><td align="left" 
colspan="1" rowspan="1" valign="top">tabindex</td><td align="left" colspan="1" 
rowspan="1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the html tabindex attribute on rendered html 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">template</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">The template (other than default) to use for rendering the 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" valign=
 "top">templateDir</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">The template directory.</td></tr><tr><td align="left" colspan="1" 
rowspan="1" valign="top">theme</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">The theme (other than default) to use for rendering the 
element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">title</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" valign="top"></t
 d><td align="left" colspan="1" rowspan="1" valign="top">false</td><td 
align="left" colspan="1" rowspan="1" valign="top">String</td><td align="left" 
colspan="1" rowspan="1" valign="top">Set the html title attribute on rendered 
html element</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">tooltip</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Set the tooltip of this particular component</td></tr><tr><td 
align="left" colspan="1" rowspan="1" valign="top">tooltipConfig</td><td 
align="left" colspan="1" rowspan="1" valign="top">false</td><td align="left" 
colspan="1" rowspan="1" valign="top"></td><td align="left" colspan="1" 
rowspan="1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">St
 ring</td><td align="left" colspan="1" rowspan="1" valign="top">Deprecated. Use 
individual tooltip configuration attributes instead.</td></tr><tr><td 
align="left" colspan="1" rowspan="1" valign="top">tooltipCssClass</td><td 
align="left" colspan="1" rowspan="1" valign="top">false</td><td align="left" 
colspan="1" rowspan="1" valign="top">StrutsTTClassic</td><td align="left" 
colspan="1" rowspan="1" valign="top">false</td><td align="left" colspan="1" 
rowspan="1" valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">CSS class applied to JavaScrip tooltips</td></tr><tr><td 
align="left" colspan="1" rowspan="1" valign="top">tooltipDelay</td><td 
align="left" colspan="1" rowspan="1" valign="top">false</td><td align="left" 
colspan="1" rowspan="1" valign="top">Classic</td><td align="left" colspan="1" 
rowspan="1" valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Delay in millisecond
 s, before showing JavaScript tooltips </td></tr><tr><td align="left" 
colspan="1" rowspan="1" valign="top">tooltipIconPath</td><td align="left" 
colspan="1" rowspan="1" valign="top">false</td><td align="left" colspan="1" 
rowspan="1" valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Icon path used for image that will have the 
tooltip</td></tr><tr><td align="left" colspan="1" rowspan="1" 
valign="top">type</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">text</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Specifies the html5 type element to display. e.g. text, email, 
url</td></tr><tr><td align="left" colspan="1" rowspan="1" valign
 ="top">value</td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top"></td><td align="left" colspan="1" rowspan="1" 
valign="top">false</td><td align="left" colspan="1" rowspan="1" 
valign="top">String</td><td align="left" colspan="1" rowspan="1" 
valign="top">Preset the value of input element.</td></tr></table></p><h2 
id="textfield-Examples">Examples</h2><p></p><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[
 In this example, a text control for the &quot;user&quot; property is rendered. 
The label is also retrieved from a ResourceBundle via the key attribute.
 ]]></script>
 </div></div><div class="code panel pdl" style="border-width: 1px;"><div 
class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" 
type="syntaxhighlighter"><![CDATA[
+<script class="brush: xml; gutter: false; theme: Confluence" 
type="syntaxhighlighter"><![CDATA[
 &lt;s:textfield key=&quot;user&quot; /&gt;
 ]]></script>
 </div></div></div>

Reply via email to