You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/04/26 20:40:46 UTC

svn commit: r906991 [9/17] - /websites/production/struts/content/release/2.3.x/docs/

Modified: websites/production/struts/content/release/2.3.x/docs/message-resource-files.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/message-resource-files.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/message-resource-files.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
     
@@ -139,242 +138,83 @@ under the License. 
             <div id="ConfluenceContent">    <div class="aui-message hint shadowed information-macro">
                             <span class="aui-icon icon-hint">Icon</span>
                 <div class="message-content">
-                            <p>This tutorial assumes you've completed the <a shape="rect" href="form-validation.html">Form Validation</a> tutorial and have a working form_validation project.  The example code for this tutorial, message_resource, is available for checkout from the <br clear="none">
-Struts 2 subversion sandbox at <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2examples">https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2examples</a>. </p>
+                            <p>This tutorial assumes you've completed the <a shape="rect" href="form-validation.html">Form Validation</a> tutorial and have a working form_validation project. The example code for this tutorial, message_resource, is available for checkout from the <br clear="none"> Struts 2 GitHub repository at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-examples</a>.</p>
                     </div>
     </div>
-
-
-<h3 id="MessageResourceFiles-Introduction">Introduction</h3>
-<p>In this tutorial we'll explore using Struts 2 message resource capabilities (also called resource bundles).  Message resources provide a simple way to put text in a view page that is the same through out your application, to create form field labels, and to change text to a specific language based on the user's locale (i18n).</p>
-
-    <div class="aui-message success shadowed information-macro">
+<h3 id="MessageResourceFiles-Introduction">Introduction</h3><p>In this tutorial we'll explore using Struts 2 message resource capabilities (also called resource bundles). Message resources provide a simple way to put text in a view page that is the same through out your application, to create form field labels, and to change text to a specific language based on the user's locale (i18n).</p>    <div class="aui-message success shadowed information-macro">
                             <span class="aui-icon icon-success">Icon</span>
                 <div class="message-content">
-                            <p>The <a shape="rect" class="external-link" href="http://struts.apache.org/mail.html">Struts 2 user mailing list</a> is an excellent place to get help.  If you are having a problem getting the tutorial example applications to work search the Struts 2 mailing list.  If you don't find an answer to your problem, post a question on the mailing list. </p>
+                            <p>The <a shape="rect" class="external-link" href="http://struts.apache.org/mail.html">Struts 2 user mailing list</a> is an excellent place to get help. If you are having a problem getting the tutorial example applications to work search the Struts 2 mailing list. If you don't find an answer to your problem, post a question on the mailing list.</p>
                     </div>
     </div>
-
-
-<h3 id="MessageResourceFiles-MessageResourcePropertyFiles">Message Resource Property Files</h3>
-<p>In a Struts 2 web application you may associate a message resource property file with each Struts 2 Action class by creating a properties file with the same name as the Action class and having the .properties extension.  This properties file must go in the same package as the Action class.  For our tutorial example, let's say we want to place the form field labels into a separate file where we can easily change them and also provide the capability to display the labels in other languages.</p>
-
-<p>If you're doing this tutorial after completing <a shape="rect" href="form-validation.html">Form Validation</a> then you can make these changes to that tutorial's example application.  </p>
-
-<p>Put the text below in a file named Register.properties in the org.apache.struts.register.action package in the src/resources/java folder.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Register.properties</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[
-personBean.firstName=First name
+<h3 id="MessageResourceFiles-MessageResourcePropertyFiles">Message Resource Property Files</h3><p>In a Struts 2 web application you may associate a message resource property file with each Struts 2 Action class by creating a properties file with the same name as the Action class and having the .properties extension. This properties file must go in the same package as the Action class. For our tutorial example, let's say we want to place the form field labels into a separate file where we can easily change them and also provide the capability to display the labels in other languages.</p><p>If you're doing this tutorial after completing <a shape="rect" href="form-validation.html">Form Validation</a> then you can make these changes to that tutorial's example application.</p><p>Put the text below in a file named Register.properties in the org.apache.struts.register.action package in the src/resources/java folder.</p><div class="code panel pdl" style="border-width: 1px;"><div class="code
 Header panelHeader pdl" style="border-bottom-width: 1px;"><b>Register.properties</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[personBean.firstName=First name
 personBean.lastName=Last name
 personBean.age=Age
 personBean.email=Email
 thankyou=Thank you for registering %{personBean.firstName}.
 ]]></script>
-</div></div>
-
-<p>The above is just a standard Java properties file.  The key is to the left of the = sign and the value for the key is to the right.  When the Register action is executed these properties will be available to the view page by referencing the key name.</p>
-
-<h3 id="MessageResourceFiles-Struts2KeyAttribute">Struts 2 Key Attribute</h3>
-<p>The Struts 2 key attribute can be used in the <a shape="rect" href="textfield.html">textfield</a> tag to instruct the framework what value to use for the textfield's name and label attributes.  Instead of providing those attributes and their values directly, you can just use the key attribute.</p>
-
-<p>If you open register.jsp from the <a shape="rect" href="form-validation.html">Form Validation</a> tutorial you'll see this Struts 2 textfield tag:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>textfield tag</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;s:textfield name=&quot;personBean.firstName&quot; label=&quot;First name&quot; /&gt;
+</div></div><p>The above is just a standard Java properties file. The key is to the left of the = sign and the value for the key is to the right. When the Register action is executed these properties will be available to the view page by referencing the key name.</p><h3 id="MessageResourceFiles-Struts2KeyAttribute">Struts 2 Key Attribute</h3><p>The Struts 2 key attribute can be used in the <a shape="rect" href="textfield.html">textfield</a> tag to instruct the framework what value to use for the textfield's name and label attributes. Instead of providing those attributes and their values directly, you can just use the key attribute.</p><p>If you open register.jsp from the <a shape="rect" href="form-validation.html">Form Validation</a> tutorial you'll see this Struts 2 textfield tag:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>textfield tag</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;s:textfield name=&quot;personBean.firstName&quot; label=&quot;First name&quot; /&gt;
 ]]></script>
-</div></div>
-
-<p>Instead of specifying the name and label attributes you can just use the key attribute.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>textfield tag with key attribute</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;s:textfield key=&quot;personBean.firstName&quot;  /&gt;
+</div></div><p>Instead of specifying the name and label attributes you can just use the key attribute.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>textfield tag with key attribute</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;s:textfield key=&quot;personBean.firstName&quot;  /&gt;
 ]]></script>
-</div></div>
-
-<p>The value for the key attribute instructs the Struts 2 framework to use the same value for the name attribute (personBean.firstName).  For the label attribute's value the value of the key attribute is used by the Struts 2 framework to find a key in a properties file with the same value.  So in our example, Struts 2 will look in Register.properties for a key with a value of personBean.firstName.  The value of that key (First name) will be used as the label attribute's value.</p>
-
-<p>To enable the key attribute to find the properties file, the display of the view page must be the result of executing a Struts 2 Action class.  Right now if you examine index.jsp from the <a shape="rect" href="form-validation.html">Form Validation</a> tutorial the link to the register.jsp page is a standard URL.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>link to register.jsp</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;p&gt;&lt;a href=&quot;register.jsp&quot;&gt;Please register&lt;/a&gt; for our prize drawing.&lt;/p&gt;
+</div></div><p>The value for the key attribute instructs the Struts 2 framework to use the same value for the name attribute (personBean.firstName). For the label attribute's value the value of the key attribute is used by the Struts 2 framework to find a key in a properties file with the same value. So in our example, Struts 2 will look in Register.properties for a key with a value of personBean.firstName. The value of that key (First name) will be used as the label attribute's value.</p><p>To enable the key attribute to find the properties file, the display of the view page must be the result of executing a Struts 2 Action class. Right now if you examine index.jsp from the <a shape="rect" href="form-validation.html">Form Validation</a> tutorial the link to the register.jsp page is a standard URL.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>link to register.jsp</b></div><div class="codeConten
 t panelContent pdl">
+<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;p&gt;&lt;a href=&quot;register.jsp&quot;&gt;Please register&lt;/a&gt; for our prize drawing.&lt;/p&gt;
 ]]></script>
-</div></div>
-
-<p>We need to change the above link so that it goes through the Register.java Struts 2 Action class.  Replace the above with this markup.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>link to Register Action class</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;s:url action=&quot;registerInput&quot; var=&quot;registerInputLink&quot; /&gt;
+</div></div><p>We need to change the above link so that it goes through the Register.java Struts 2 Action class. Replace the above with this markup.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>link to Register Action class</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;s:url action=&quot;registerInput&quot; var=&quot;registerInputLink&quot; /&gt;
 &lt;p&gt;&lt;a href=&quot;${registerInputLink}&quot;&gt;Please register&lt;/a&gt; for our prize drawing.&lt;/p&gt;
 ]]></script>
-</div></div>
-
-<p>We use the Struts 2 url tag to create a link to action registerInput. We then use that link as the value for the href attribute of the anchor tag.  We must define the registerInput action in struts.xml.  Add the following to struts.xml.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>registerInput action node for struts.xml</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;action name=&quot;registerInput&quot; class=&quot;org.apache.struts.register.action.Register&quot; method=&quot;input&quot; &gt;
+</div></div><p>We use the Struts 2 url tag to create a link to action registerInput. We then use that link as the value for the href attribute of the anchor tag. We must define the registerInput action in struts.xml. Add the following to struts.xml.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>registerInput action node for struts.xml</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;action name=&quot;registerInput&quot; class=&quot;org.apache.struts.register.action.Register&quot; method=&quot;input&quot; &gt;
 	&lt;result name=&quot;input&quot;&gt;/register.jsp&lt;/result&gt;
 &lt;/action&gt;
 ]]></script>
-</div></div>
-
-<p>The above action node instructs the Struts 2 framework to execute class Register's input method in response to action registerInput.  The input method is inherited by class Register from class ActionSupport.  The default behavior of the inherited input method is to return the String input.  The result node above specifies that if the returned result is "input" then render the view register.jsp.</p>
-
-<p>By doing the above the view page register.jsp will have access to the properties defined in Register.properties.  The Struts 2 framework will make those properties defined in Register.properties available to the view page since the view page was rendered after Register.java (the Struts 2 Action class) was executed.</p>
-
-<p>Follow the instructions (README.txt) in the project to create the war file and copy the war file to your servlet container.  Open a web browser and navigate to the home page specified in the README.txt file (index.action).  You should see a link to registerInput.action when mousing over the hyperlink Please Register.</p>
-
-<p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811894/registerInput.png?version=1&amp;modificationDate=1267884526000&amp;api=v2" data-image-src="/confluence/download/attachments/14811894/registerInput.png?version=1&amp;modificationDate=1267884526000&amp;api=v2"></p>
-
-<p>When you click on the Please Register link your browser should display the register.jsp.  The form field labels should be the key values from the Register.properties file.</p>
-
-<p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811894/register.png?version=1&amp;modificationDate=1267884526000&amp;api=v2" data-image-src="/confluence/download/attachments/14811894/register.png?version=1&amp;modificationDate=1267884526000&amp;api=v2"></p>
-
-
-<h3 id="MessageResourceFiles-Struts2TextTag">Struts 2 Text Tag</h3>
-<p>We can also use the Struts 2 text tag to display values from a properties file.  In thankyou.jsp add this text tag instead of the h3 tag that is in thankyou.jsp.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>text tag</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;h3&gt;&lt;s:text name=&quot;thankyou&quot; /&gt;&lt;/h3&gt;
+</div></div><p>The above action node instructs the Struts 2 framework to execute class Register's input method in response to action registerInput. The input method is inherited by class Register from class ActionSupport. The default behavior of the inherited input method is to return the String input. The result node above specifies that if the returned result is "input" then render the view register.jsp.</p><p>By doing the above the view page register.jsp will have access to the properties defined in Register.properties. The Struts 2 framework will make those properties defined in Register.properties available to the view page since the view page was rendered after Register.java (the Struts 2 Action class) was executed.</p><p>Follow the instructions (README.txt) in the project to create the war file and copy the war file to your servlet container. Open a web browser and navigate to the home page specified in the README.txt file (index.action). You should see a link to registerInpu
 t.action when mousing over the hyperlink Please Register.</p><p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811894/registerInput.png?version=1&amp;modificationDate=1267884526000&amp;api=v2" data-image-src="/confluence/download/attachments/14811894/registerInput.png?version=1&amp;modificationDate=1267884526000&amp;api=v2"></p><p>When you click on the Please Register link your browser should display the register.jsp. The form field labels should be the key values from the Register.properties file.</p><p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811894/register.png?version=1&amp;modificationDate=1267884526000&amp;api=v2" data-image-src="/confluence/download/attachments/14811894/register.png?version=1&amp;modificationDate=1267884526000&amp;api=v2"></p><h3 id="MessageResourceFiles-Struts2TextTag">Struts 2 Text Tag</h3><p>We can also use the Struts 2 text tag to display 
 values from a properties file. In thankyou.jsp add this text tag instead of the h3 tag that is in thankyou.jsp.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>text tag</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;h3&gt;&lt;s:text name=&quot;thankyou&quot; /&gt;&lt;/h3&gt;
 ]]></script>
-</div></div>
-
-<p>Since thankyou.jsp is also rendered after executing the Register.java Action class, the key thankyou and its value will be available to the view page.  </p>
-
-<p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811894/thankyou.png?version=1&amp;modificationDate=1267884526000&amp;api=v2" data-image-src="/confluence/download/attachments/14811894/thankyou.png?version=1&amp;modificationDate=1267884526000&amp;api=v2"></p>
-
-<p>How did the value entered for the first name input field get displayed on thankyou.jsp?  Look back at the value for the thankyou key in the Register.properties file.  </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Register.properties</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[
-thankyou=Thank you for registering %{personBean.firstName}.
+</div></div><p>Since thankyou.jsp is also rendered after executing the Register.java Action class, the key thankyou and its value will be available to the view page.</p><p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811894/thankyou.png?version=1&amp;modificationDate=1267884526000&amp;api=v2" data-image-src="/confluence/download/attachments/14811894/thankyou.png?version=1&amp;modificationDate=1267884526000&amp;api=v2"></p><p>How did the value entered for the first name input field get displayed on thankyou.jsp? Look back at the value for the thankyou key in the Register.properties file.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Register.properties</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[thankyou=Thank you for registering %{personBean.firstName}.
 ]]></script>
-</div></div>
-<p>The markup %{personBean.firstName} tells Struts 2 to replace this part with the result of calling getPersonBean, which returns a Person object.  Then call the getFirstName method which returns a String (the value the user inputted into the personBean.firstName form field on register.jsp).</p>
-
-<h3 id="MessageResourceFiles-PackageLevelProperties">Package Level Properties</h3>
-<p>What if you want a properties file with keys and values that can be referenced from multiple view pages and those view pages are rendered after executing different Action classes?  Struts 2 has the ability to use multiple property files provided the property file is found in the package hierarchy.  </p>
-
-<p>Place the following in a file named package.properties and save that file in package org.apache.struts in src/main/resources. </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>package.properties</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[
-greeting=Welcome to The Wonderful World of Struts 2
+</div></div><p>The markup %{personBean.firstName} tells Struts 2 to replace this part with the result of calling getPersonBean, which returns a Person object. Then call the getFirstName method which returns a String (the value the user inputted into the personBean.firstName form field on register.jsp).</p><h3 id="MessageResourceFiles-PackageLevelProperties">Package Level Properties</h3><p>What if you want a properties file with keys and values that can be referenced from multiple view pages and those view pages are rendered after executing different Action classes? Struts 2 has the ability to use multiple property files provided the property file is found in the package hierarchy.</p><p>Place the following in a file named package.properties and save that file in package org.apache.struts in src/main/resources.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>package.properties</b></div><div class="
 codeContent panelContent pdl">
+<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[greeting=Welcome to The Wonderful World of Struts 2
 ]]></script>
-</div></div>
-
-<p>Now any view rendered by an Action that is in the hierarchy org.apache.struts... can use a Struts 2 text tag with a name attribute value of "greeting" to display the value of the greeting property key.  For example add the following markup to helloworld.jsp before the h2 tag.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;h1&gt;&lt;s:text name=&quot;greeting&quot; /&gt;&lt;/h1&gt;
+</div></div><p>Now any view rendered by an Action that is in the hierarchy org.apache.struts... can use a Struts 2 text tag with a name attribute value of "greeting" to display the value of the greeting property key. For example add the following markup to helloworld.jsp before the h2 tag.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;h1&gt;&lt;s:text name=&quot;greeting&quot; /&gt;&lt;/h1&gt;
 ]]></script>
-</div></div>
-
-<p>Then rebuild the war file and deploy it to your servlet container.  Go to index.action and click on the link for Hello World.  You should see:</p>
-
-<p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811894/hellogreeting.png?version=1&amp;modificationDate=1267884526000&amp;api=v2" data-image-src="/confluence/download/attachments/14811894/hellogreeting.png?version=1&amp;modificationDate=1267884526000&amp;api=v2"></p>
-
-<p>The property keys and values defined in package.properties are available to any view that is rendered after executing an Action class that is the package hierarchy that includes package.properties.</p>
-
-<h3 id="MessageResourceFiles-GlobalProperties">Global Properties</h3>
-<p>You can also specify a global property file in struts.xml.  The keys and values defined in that property file will be available to all the view pages that are rendered after executing an Action class.</p>
-
-<p>Add the following to a file named global.properties (note the name doesn't have to be global).</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>global.properties</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[
-contact=For assistance contact &lt;a href=&#39;mailto:contact@email.com&#39;&gt;contact@email.com&lt;/a&gt;
+</div></div><p>Then rebuild the war file and deploy it to your servlet container. Go to index.action and click on the link for Hello World. You should see:</p><p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811894/hellogreeting.png?version=1&amp;modificationDate=1267884526000&amp;api=v2" data-image-src="/confluence/download/attachments/14811894/hellogreeting.png?version=1&amp;modificationDate=1267884526000&amp;api=v2"></p><p>The property keys and values defined in package.properties are available to any view that is rendered after executing an Action class that is the package hierarchy that includes package.properties.</p><h3 id="MessageResourceFiles-GlobalProperties">Global Properties</h3><p>You can also specify a global property file in struts.xml. The keys and values defined in that property file will be available to all the view pages that are rendered after executing an Action class.</p><p>Add the following to a file nam
 ed global.properties (note the name doesn't have to be global).</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>global.properties</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[contact=For assistance contact &lt;a href=&#39;mailto:contact@email.com&#39;&gt;contact@email.com&lt;/a&gt;
 ]]></script>
-</div></div>
-
-<p>Save the global.properties file in the src/main/resources folder.  </p>
-
-<p>To inform the Struts 2 framework about the global.properties file add the follow node to struts.xml after the constant name="struts.devmode" node.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Specify Global Property File In struts.xml</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;constant name=&quot;struts.custom.i18n.resources&quot; value=&quot;global&quot; /&gt;
+</div></div><p>Save the global.properties file in the src/main/resources folder.</p><p>To inform the Struts 2 framework about the global.properties file add the follow node to struts.xml after the constant name="struts.devmode" node.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Specify Global Property File In struts.xml</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;constant name=&quot;struts.custom.i18n.resources&quot; value=&quot;global&quot; /&gt;
 ]]></script>
-</div></div>
-
-
-<p>To use the contact key in a view page, add the following markup to index.jsp just before the closing body tag.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Using contact property</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;hr /&gt;
+</div></div><p>To use the contact key in a view page, add the following markup to index.jsp just before the closing body tag.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Using contact property</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;hr /&gt;
 &lt;s:text name=&quot;contact&quot; /&gt;
 ]]></script>
-</div></div>
-
-<p>Rebuild the war file, deploy it to your Servlet container, and then go to index.action.  You should see:</p>
-
-<p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811894/contact.png?version=1&amp;modificationDate=1267884526000&amp;api=v2" data-image-src="/confluence/download/attachments/14811894/contact.png?version=1&amp;modificationDate=1267884526000&amp;api=v2"></p>
-
-<p>Struts 2 will look for a property key of contact in all the property files starting with the property file that matches the Action class, then in the property files that are in the package hierarchy of the Action class, and then in any property files specified in struts.xml.  For this example Struts 2 will find the contact key in global.properties.  The value of the contact key will be displayed where we have put the text tag.</p>
-
-<p>You can add the text tag above to all the JSPs in this example.</p>
-
-<h3 id="MessageResourceFiles-Internationalization(i18n)">Internationalization (i18n)</h3>
-<p>Using message resource files (resource bundles) also enables you to provide text in different languages.  By default, Struts 2 will use the user's default locale.  If that locale is en for English then the property files used will be the ones without a locale specification (for example Register.properties).  If the locale is not English but say Spanish (es) then Struts 2 will look for a properties file named Register_es.properties.</p>
-
-<p>To provide an example of Struts 2 support for i18n create a file named Register_es.properties and in that file add the following Spanish translations.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Register_es.properties</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[
-personBean.firstName=Nombre
+</div></div><p>Rebuild the war file, deploy it to your Servlet container, and then go to index.action. You should see:</p><p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811894/contact.png?version=1&amp;modificationDate=1267884526000&amp;api=v2" data-image-src="/confluence/download/attachments/14811894/contact.png?version=1&amp;modificationDate=1267884526000&amp;api=v2"></p><p>Struts 2 will look for a property key of contact in all the property files starting with the property file that matches the Action class, then in the property files that are in the package hierarchy of the Action class, and then in any property files specified in struts.xml. For this example Struts 2 will find the contact key in global.properties. The value of the contact key will be displayed where we have put the text tag.</p><p>You can add the text tag above to all the JSPs in this example.</p><h3 id="MessageResourceFiles-Internationalization(i18n)">
 Internationalization (i18n)</h3><p>Using message resource files (resource bundles) also enables you to provide text in different languages. By default, Struts 2 will use the user's default locale. If that locale is en for English then the property files used will be the ones without a locale specification (for example Register.properties). If the locale is not English but say Spanish (es) then Struts 2 will look for a properties file named Register_es.properties.</p><p>To provide an example of Struts 2 support for i18n create a file named Register_es.properties and in that file add the following Spanish translations.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Register_es.properties</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[personBean.firstName=Nombre
 personBean.lastName=Apellidos
 personBean.age=Edad
 personBean.email=Correo
 thankyou=Gracias por registrarse, %{personBean.firstName}. 
 ]]></script>
-</div></div>
-
-    <div class="aui-message warning shadowed information-macro">
+</div></div>    <div class="aui-message warning shadowed information-macro">
                             <span class="aui-icon icon-warning">Icon</span>
                 <div class="message-content">
                             <p>My apologies to Spanish language speakers for any mistakes in the Spanish translations.</p>
                     </div>
     </div>
-
-
-<p>Save the Register_es.properties file in the same package as Register.properties.</p>
-
-<p>In our example application, we need to tell Struts 2 to use a locale value of es (since we're not in a Spanish locale) instead of the default locale value of our location (which is en). Add the following markup to index.jsp.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Specify The Locale As a URL Parameter</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;h3&gt;Registro español&lt;/h3&gt;
+<p>Save the Register_es.properties file in the same package as Register.properties.</p><p>In our example application, we need to tell Struts 2 to use a locale value of es (since we're not in a Spanish locale) instead of the default locale value of our location (which is en). Add the following markup to index.jsp.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Specify The Locale As a URL Parameter</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;h3&gt;Registro español&lt;/h3&gt;
 &lt;s:url action=&quot;registerInput&quot; var=&quot;registerInputLinkES&quot;&gt;
     &lt;s:param name=&quot;request_locale&quot;&gt;es&lt;/s:param&gt;
 &lt;/s:url&gt;
 &lt;p&gt;&lt;a href=&quot;${registerInputLinkES}&quot;&gt;Por favor, regístrese&lt;/a&gt; para nuestro sorteo&lt;/p&gt;
 ]]></script>
-</div></div>
-
-<p>In the above markup we've added a parameter named request_locale to the URL.  The value of that parameter is es.  The Action class that responds to this URL (Register.java) will see that the locale is es and will look for property files with _es (for example Register_es.properties).  It will use those property files to find the values of the property keys referenced by the view page (e.g. personBean.firstName).  </p>
-
-<p>After clicking on the above link you should see the same form as before but with the form field labels in Spanish.</p>
-
-<p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811894/spanishform.png?version=1&amp;modificationDate=1267884526000&amp;api=v2" data-image-src="/confluence/download/attachments/14811894/spanishform.png?version=1&amp;modificationDate=1267884526000&amp;api=v2"></p>
-
-<p>If we implement the same concept by creating _es.properties versions of global.properties (global_es.properties) and package.properties (package_es.properties) then we can create a complete registration web page in Spanish.  Download the finished example application for this tutorial from Google Code - <a shape="rect" class="external-link" href="http://code.google.com/p/struts2-examples/downloads/list" rel="nofollow">http://code.google.com/p/struts2-examples/downloads/list</a> to see those property files and run the complete example with the registration form in Spanish.</p>
-
-<h3 id="MessageResourceFiles-Summary">Summary</h3>
-<p>We've covered how to use message resources (resource bundles) in Struts 2 and also introduced how Struts 2 enables internationalization (i18n) in this tutorial.  To fully understand these concepts and learn more about Struts 2 consult the main Struts 2 documentation available at <a shape="rect" class="external-link" href="http://struts.apache.org">http://struts.apache.org</a>.</p>
-
-<h3 id="MessageResourceFiles-UpNext">Up Next</h3>
-
-<p>In our next tutorial we'll cover how to configure Struts 2 to handle any uncaught exceptions.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Next </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Onward to <a shape="rect" href="exception-handling.html">Exception Handling</a> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Prev </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Return to <a shape="rect" href="form-validation.html">Form Validation</a> </p></td></tr></tbody></table></div></div>
+</div></div><p>In the above markup we've added a parameter named request_locale to the URL. The value of that parameter is es. The Action class that responds to this URL (Register.java) will see that the locale is es and will look for property files with _es (for example Register_es.properties). It will use those property files to find the values of the property keys referenced by the view page (e.g. personBean.firstName).</p><p>After clicking on the above link you should see the same form as before but with the form field labels in Spanish.</p><p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811894/spanishform.png?version=1&amp;modificationDate=1267884526000&amp;api=v2" data-image-src="/confluence/download/attachments/14811894/spanishform.png?version=1&amp;modificationDate=1267884526000&amp;api=v2"></p><p>If we implement the same concept by creating _es.properties versions of global.properties (global_es.properties) and packa
 ge.properties (package_es.properties) then we can create a complete registration web page in Spanish. Download the finished example application for this tutorial from Google Code - <a shape="rect" class="external-link" href="http://code.google.com/p/struts2-examples/downloads/list" rel="nofollow">http://code.google.com/p/struts2-examples/downloads/list</a> to see those property files and run the complete example with the registration form in Spanish.</p><h3 id="MessageResourceFiles-Summary">Summary</h3><p>We've covered how to use message resources (resource bundles) in Struts 2 and also introduced how Struts 2 enables internationalization (i18n) in this tutorial. To fully understand these concepts and learn more about Struts 2 consult the main Struts 2 documentation available at <a shape="rect" class="external-link" href="http://struts.apache.org">http://struts.apache.org</a>.</p><h3 id="MessageResourceFiles-UpNext">Up Next</h3><p>In our next tutorial we'll cover how to configure St
 ruts 2 to handle any uncaught exceptions.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Next</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Onward to <a shape="rect" href="exception-handling.html">Exception Handling</a></p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Prev</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Return to <a shape="rect" href="form-validation.html">Form Validation</a></p></td></tr></tbody></table></div></div>
         </div>
 
         

Modified: websites/production/struts/content/release/2.3.x/docs/message-store-interceptor.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/message-store-interceptor.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/message-store-interceptor.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>

Modified: websites/production/struts/content/release/2.3.x/docs/migration-guide.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/migration-guide.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/migration-guide.html Sat Apr 26 18:40:39 2014
@@ -19,7 +19,7 @@ under the License. 
 -->
 <html>
 <head>
-    <LINK type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
+    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
     <style type="text/css">
         .dp-highlighter {
             width:95% !important;
@@ -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.3.x">Version Notes 2.3.x</h3><ul><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-no
 tes-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><l
 i><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">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="rect" href="rel
 ease-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-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="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="Migrati
 onGuide-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" row
 span="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-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 id="ConfluenceContent"><p>Getting here from there.</p><h3 id="MigrationGuide-VersionNotes2.3.x">Version Notes 2.3.x</h3><ul><li><a shape="rect" href="version-notes-2318.html">Version Notes 2.3.18</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-no
 tes-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></l
 i><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">Versio
 n 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">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" hr
 ef="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-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="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><t
 h 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-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">
@@ -313,6 +313,12 @@ 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>
+                                    $page.link($child)
+                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
+                    <br>
                             </div>
         
     </div>

Modified: websites/production/struts/content/release/2.3.x/docs/model-driven-interceptor.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/model-driven-interceptor.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/model-driven-interceptor.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>

Modified: websites/production/struts/content/release/2.3.x/docs/model-driven.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/model-driven.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/model-driven.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
     
     <script type="text/javascript">

Modified: websites/production/struts/content/release/2.3.x/docs/multiple-struts-2-wars-in-a-single-ear.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/multiple-struts-2-wars-in-a-single-ear.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/multiple-struts-2-wars-in-a-single-ear.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
     

Modified: websites/production/struts/content/release/2.3.x/docs/multiple-submit-buttons.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/multiple-submit-buttons.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/multiple-submit-buttons.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
     

Modified: websites/production/struts/content/release/2.3.x/docs/namespace-configuration.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/namespace-configuration.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/namespace-configuration.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
     

Modified: websites/production/struts/content/release/2.3.x/docs/non-ioc-version-of-opensessioninviewinterceptor.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/non-ioc-version-of-opensessioninviewinterceptor.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/non-ioc-version-of-opensessioninviewinterceptor.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
     
     <script type="text/javascript">

Modified: websites/production/struts/content/release/2.3.x/docs/nutshell.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/nutshell.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/nutshell.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
     

Modified: websites/production/struts/content/release/2.3.x/docs/objectfactory.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/objectfactory.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/objectfactory.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
     
     <script type="text/javascript">

Modified: websites/production/struts/content/release/2.3.x/docs/ognl-basics.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/ognl-basics.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/ognl-basics.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
     
     <script type="text/javascript">

Modified: websites/production/struts/content/release/2.3.x/docs/ognl.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/ognl.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/ognl.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
     

Modified: websites/production/struts/content/release/2.3.x/docs/one-time-steps.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/one-time-steps.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/one-time-steps.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
     
     <script type="text/javascript">
@@ -137,11 +136,11 @@ under the License. 
         <div class="wiki-content">
             <div id="ConfluenceContent"><h1 id="Onetimesteps-Content">Content</h1>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1394094446760 {padding: 0px;}
-div.rbtoc1394094446760 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1394094446760 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1396727560803 {padding: 0px;}
+div.rbtoc1396727560803 ul {list-style: none;margin-left: 0px;}
+div.rbtoc1396727560803 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1394094446760">
+/*]]>*/</style><div class="toc-macro rbtoc1396727560803">
 <ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#Onetimesteps-Content">Content</a>
 <ul class="toc-indentation"><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#Onetimesteps-Keysandconfiguration">Keys and configuration</a>
 <ul class="toc-indentation"><li><span class="TOCOutline">1.1.1</span> <a shape="rect" href="#Onetimesteps-CreateandinstallaSSHkey">Create and install a SSH key</a></li><li><span class="TOCOutline">1.1.2</span> <a shape="rect" href="#Onetimesteps-CreateaPGPkey">Create a PGP key</a></li><li><span class="TOCOutline">1.1.3</span> <a shape="rect" href="#Onetimesteps-UpdateMavensettingsforourservers">Update Maven settings for our servers</a></li><li><span class="TOCOutline">1.1.4</span> <a shape="rect" href="#Onetimesteps-IncreaseMemorySettingsforMaven">Increase Memory Settings for Maven</a></li></ul>

Modified: websites/production/struts/content/release/2.3.x/docs/optgroup.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/optgroup.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/optgroup.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>

Modified: websites/production/struts/content/release/2.3.x/docs/optiontransferselect.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/optiontransferselect.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/optiontransferselect.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>

Modified: websites/production/struts/content/release/2.3.x/docs/osgi-plugin.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/osgi-plugin.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/osgi-plugin.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
     

Modified: websites/production/struts/content/release/2.3.x/docs/oval-plugin.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/oval-plugin.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/oval-plugin.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
     

Modified: websites/production/struts/content/release/2.3.x/docs/package-configuration.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/package-configuration.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/package-configuration.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
     
     <script type="text/javascript">

Modified: websites/production/struts/content/release/2.3.x/docs/param.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/param.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/param.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>

Modified: websites/production/struts/content/release/2.3.x/docs/parameter-filter-interceptor.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/parameter-filter-interceptor.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/parameter-filter-interceptor.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>

Modified: websites/production/struts/content/release/2.3.x/docs/parameters-in-configuration-results.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/parameters-in-configuration-results.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/parameters-in-configuration-results.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
     

Modified: websites/production/struts/content/release/2.3.x/docs/parameters-interceptor.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/parameters-interceptor.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/parameters-interceptor.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>

Modified: websites/production/struts/content/release/2.3.x/docs/password.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/password.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/password.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>

Modified: websites/production/struts/content/release/2.3.x/docs/plaintext-result.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/plaintext-result.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/plaintext-result.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>

Modified: websites/production/struts/content/release/2.3.x/docs/plexus-plugin.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/plexus-plugin.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/plexus-plugin.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
     
     <script type="text/javascript">

Modified: websites/production/struts/content/release/2.3.x/docs/plugins.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/plugins.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/plugins.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License. 
     <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
     <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
     <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
-    <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
             <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>