svn commit: r1574782 - in /struts/site/trunk: ./ content/ source/

Wed, 05 Mar 2014 23:05:18 -0800 

Author: lukaszlenart
Date: Thu Mar  6 07:03:48 2014
New Revision: 1574782

URL: http://svn.apache.org/r1574782
Log:
Updates website to match the latest version

Added:
    struts/site/trunk/source/announce.md
      - copied, changed from r1570474, struts/site/trunk/source/announce.html
Removed:
    struts/site/trunk/source/announce.html
Modified:
    struts/site/trunk/_config.yml
    struts/site/trunk/content/announce-2013.html
    struts/site/trunk/content/announce.html
    struts/site/trunk/content/archetype-catalog.xml
    struts/site/trunk/content/download.html
    struts/site/trunk/content/downloads.html
    struts/site/trunk/content/index.html
    struts/site/trunk/source/downloads.html
    struts/site/trunk/source/index.html

Modified: struts/site/trunk/_config.yml
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/_config.yml?rev=1574782&r1=1574781&r2=1574782&view=diff
==============================================================================
--- struts/site/trunk/_config.yml (original)
+++ struts/site/trunk/_config.yml Thu Mar  6 07:03:48 2014
@@ -12,5 +12,7 @@ encoding: UTF-8
 root:
 
 # Simplifies introducing changes related to the latest release
-current_version: 2.3.16
-current_version_short: 2316
+current_version: 2.3.16.1
+current_version_short: 23161
+release_date: 2 march 2014
+release_date_short: 20140302

Modified: struts/site/trunk/content/announce-2013.html
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/announce-2013.html?rev=1574782&r1=1574781&r2=1574782&view=diff
==============================================================================
--- struts/site/trunk/content/announce-2013.html (original)
+++ struts/site/trunk/content/announce-2013.html Thu Mar  6 07:03:48 2014
@@ -145,9 +145,9 @@
 <p>
   Struts 2.3.16 is available in a full distribution or as separate library, 
source, example
   and documentation distributions, from the
-  <a href="http://struts.apache.org/download.cgi#struts2316";>releases page</a>.
+  <a href="http://struts.apache.org/download.cgi#struts23161";>releases 
page</a>.
   The release is also available through the central Maven repository under 
Group ID "org.apache.struts".
-  The <a 
href="http://struts.apache.org/release/2.3.x/docs/version-notes-2316.html";>version
 notes</a>
+  The <a 
href="http://struts.apache.org/release/2.3.x/docs/version-notes-23161.html";>version
 notes</a>
   are available online.
 </p>
 <p>

Modified: struts/site/trunk/content/announce.html
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/announce.html?rev=1574782&r1=1574781&r2=1574782&view=diff
==============================================================================
--- struts/site/trunk/content/announce.html (original)
+++ struts/site/trunk/content/announce.html Thu Mar  6 07:03:48 2014
@@ -112,46 +112,57 @@
   Skip to: <a href="announce-2013.html">Announcements - 2013</a>
 </p>
 
-<h4 id="a20140221">21 February 2014 - Immediately upgrade commons-fileupload 
to version 1.3.1</h4>
-<p>
-  The Apache Struts Team recommends to immediately upgrade your Struts 2
-  based projects to use the latest released version of Commons
-  FileUpload library, which is currently 1.3.1. This is necessary to
-  prevent your publicly accessible web site from being exposed to
-  possible DoS attacks [1] [2].
-</p>
-<p>
-  Your project is affected if it uses the built-in file upload mechanism
-  of Struts 2, which defaults to the use of commons-fileupload. The
-  updated commons-fileupload library is a drop-in replacement for the
-  vulnerable version. Deployed applications can be hardened by replacing
-  the commons-fileupload jar file in WEB-INF/lib with the fixed jar. For
-  Maven based Struts 2 projects, the following dependency needs to be
-  added:
-</p>
-<pre>
-  &lt;dependency&gt;
-    &lt;groupId&gt;commons-fileupload&lt;/groupId&gt;
-    &lt;artifactId&gt;commons-fileupload&lt;/artifactId&gt;
-    &lt;version&gt;1.3.1&lt;/version&gt;
-  &lt;/dependency&gt;
-</pre>
-<p>
-  More details can be found here:
-  <ol>
-    <li>
-      <a 
href="http://commons.apache.org/proper/commons-fileupload/changes-report.html#a1.3.1";>
-      
http://commons.apache.org/proper/commons-fileupload/changes-report.html#a1.3.1</a>
-    </li>
-    <li>
-      <a 
href="http://mail-archives.apache.org/mod_mbox/www-announce/201402.mbox/%3c52f373fc.9030...@apache.org%3E";>
-      
http://mail-archives.apache.org/mod_mbox/www-announce/201402.mbox/%3c52f373fc.9030...@apache.org%3E</a>
-    </li>
-  </ol>
-</p>
-<p>
-  All developers are strongly advised to perform this action.
-</p>
+<h4><span id="a20140302"> 2 March 2014 - Struts 2.3.16.1 General Availability 
Release - Security Fix Release</h4>
+
+<p>The Apache Struts group is pleased to announce that Struts 2.3.15.2 is 
available as a &quot;General Availability&quot;
+release. The GA designation is our highest quality grade.</p>
+
+<p>Apache Struts 2 is an elegant, extensible framework for creating 
enterprise-ready Java web applications.
+The framework is designed to streamline the full development cycle, from 
building, to deploying,
+to maintaining applications over time.</p>
+
+<p>Two security issues were solved with this release:</p>
+
+<ul>
+<li><a 
href="http://struts.apache.org/release/2.3.x/docs/s2-020.html";>S2-020</a> 
ClassLoader manipulation
+via request parameters</li>
+<li><a 
href="http://struts.apache.org/release/2.3.x/docs/s2-020.html";>S2-020</a> 
Commons FileUpload library was upgraded
+to version 1.3.1 to prevent DoS attacks</li>
+</ul>
+
+<p>All developers are strongly advised to perform this action.</p>
+
+<h4><span id="a20140221"> 21 February 2014 - Immediately upgrade 
commons-fileupload to version 1.3.1</h4>
+
+<p>The Apache Struts Team recommends to immediately upgrade your Struts 2
+based projects to use the latest released version of Commons
+FileUpload library, which is currently 1.3.1. This is necessary to
+prevent your publicly accessible web site from being exposed to
+possible DoS attacks (see [1] [2]).</p>
+
+<p>Your project is affected if it uses the built-in file upload mechanism
+of Struts 2, which defaults to the use of commons-fileupload. The
+updated commons-fileupload library is a drop-in replacement for the
+vulnerable version. Deployed applications can be hardened by replacing
+the commons-fileupload jar file in WEB-INF/lib with the fixed jar. For
+Maven based Struts 2 projects, the following dependency needs to be
+added:</p>
+<div class="highlight"><pre><code class="text language-text" 
data-lang="text">&lt;dependency&gt;
+  &lt;groupId&gt;commons-fileupload&lt;/groupId&gt;
+  &lt;artifactId&gt;commons-fileupload&lt;/artifactId&gt;
+  &lt;version&gt;1.3.1&lt;/version&gt;
+&lt;/dependency&gt;
+</code></pre></div>
+<p>More details can be found here:</p>
+
+<ol>
+<li><a 
href="http://commons.apache.org/proper/commons-fileupload/changes-report.html#a1.3.1";>
+  
http://commons.apache.org/proper/commons-fileupload/changes-report.html#a1.3.1</a></li>
+<li><a 
href="http://mail-archives.apache.org/mod_mbox/www-announce/201402.mbox/%3c52f373fc.9030...@apache.org%3E";>
+  
http://mail-archives.apache.org/mod_mbox/www-announce/201402.mbox/%3c52f373fc.9030...@apache.org%3E</a></li>
+</ol>
+
+<p>All developers are strongly advised to perform this action.</p>
 
 <p class="pull-right">
   Skip to: <a href="announce-2013.html">Announcements - 2013</a>

Modified: struts/site/trunk/content/archetype-catalog.xml
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/archetype-catalog.xml?rev=1574782&r1=1574781&r2=1574782&view=diff
==============================================================================
--- struts/site/trunk/content/archetype-catalog.xml (original)
+++ struts/site/trunk/content/archetype-catalog.xml Thu Mar  6 07:03:48 2014
@@ -7,42 +7,42 @@
         <archetype>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-archetype-blank</artifactId>
-            <version>2.3.16</version>
+            <version>2.3.16.1</version>
             
<repository>https://repository.apache.org/content/groups/public/</repository>
             <description>Struts 2 Archetypes - Blank</description>
         </archetype>
         <archetype>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-archetype-convention</artifactId>
-            <version>2.3.16</version>
+            <version>2.3.16.1</version>
             
<repository>https://repository.apache.org/content/groups/public/</repository>
             <description>Struts 2 Archetypes - Blank Convention</description>
         </archetype>
         <archetype>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-archetype-dbportlet</artifactId>
-            <version>2.3.16</version>
+            <version>2.3.16.1</version>
             
<repository>https://repository.apache.org/content/groups/public/</repository>
             <description>Struts 2 Archetypes - Database Portlet</description>
         </archetype>
         <archetype>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-archetype-plugin</artifactId>
-            <version>2.3.16</version>
+            <version>2.3.16.1</version>
             
<repository>https://repository.apache.org/content/groups/public/</repository>
             <description>Struts 2 Archetypes - Plugin</description>
         </archetype>
         <archetype>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-archetype-portlet</artifactId>
-            <version>2.3.16</version>
+            <version>2.3.16.1</version>
             
<repository>https://repository.apache.org/content/groups/public/</repository>
             <description>Struts 2 Archetypes - Portlet</description>
         </archetype>
         <archetype>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-archetype-starter</artifactId>
-            <version>2.3.16</version>
+            <version>2.3.16.1</version>
             
<repository>https://repository.apache.org/content/groups/public/</repository>
             <description>Struts 2 Archetypes - Starter</description>
         </archetype>

Modified: struts/site/trunk/content/download.html
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/download.html?rev=1574782&r1=1574781&r2=1574782&view=diff
==============================================================================
--- struts/site/trunk/content/download.html (original)
+++ struts/site/trunk/content/download.html Thu Mar  6 07:03:48 2014
@@ -165,27 +165,27 @@
 <h1>Full Releases</h1>
 <a name="struts-ga"></a>
 
-<a name="struts2316"></a>
-<h2>Struts 2.3.16</h2>
+<a name="struts23161"></a>
+<h2>Struts 2.3.16.1</h2>
 
 <p>
-  <a href="http://struts.apache.org/release/2.3.x/";>Apache Struts 2.3.16</a> 
is an elegant, extensible
+  <a href="http://struts.apache.org/release/2.3.x/";>Apache Struts 2.3.16.1</a> 
is an elegant, extensible
   framework for creating enterprise-ready Java web applications. It is 
available in a full distribution,
   or as separate library, source, example and documentation distributions.
-  Struts 2.3.16 is the "best available" version of Struts in the 2.3 series.
+  Struts 2.3.16.1 is the "best available" version of Struts in the 2.3 series.
 </p>
 
 <ul>
   <li>
-    <a 
href="http://struts.apache.org/release/2.3.x/docs/version-notes-2316.html";>Version
 Notes</a>
+    <a 
href="http://struts.apache.org/release/2.3.x/docs/version-notes-23161.html";>Version
 Notes</a>
   </li>
 
   <li>Full Distribution:
     <ul>
       <li>
-        <a 
href="[preferred]/struts/binaries/struts-2.3.16-all.zip">struts-2.3.16-all.zip</a>
 (65MB)
-        [<a 
href="http://www.apache.org/dist/struts/binaries/struts-2.3.16-all.zip.asc";>PGP</a>]
-        [<a 
href="http://www.apache.org/dist/struts/binaries/struts-2.3.16-all.zip.md5";>MD5</a>]
+        <a 
href="[preferred]/struts/binaries/struts-2.3.16.1-all.zip">struts-2.3.16.1-all.zip</a>
 (65MB)
+        [<a 
href="http://www.apache.org/dist/struts/binaries/struts-2.3.16.1-all.zip.asc";>PGP</a>]
+        [<a 
href="http://www.apache.org/dist/struts/binaries/struts-2.3.16.1-all.zip.md5";>MD5</a>]
       </li>
     </ul>
   </li>
@@ -193,18 +193,18 @@
   <li>Example Applications:
     <ul>
       <li>
-        <a 
href="[preferred]/struts/examples/struts-2.3.16-apps.zip">struts-2.3.16-apps.zip</a>
 (35MB)
-        [<a 
href="http://www.apache.org/dist/struts/examples/struts-2.3.16-apps.zip.asc";>PGP</a>]
-        [<a 
href="http://www.apache.org/dist/struts/examples/struts-2.3.16-apps.zip.md5";>MD5</a>]
+        <a 
href="[preferred]/struts/examples/struts-2.3.16.1-apps.zip">struts-2.3.16.1-apps.zip</a>
 (35MB)
+        [<a 
href="http://www.apache.org/dist/struts/examples/struts-2.3.16.1-apps.zip.asc";>PGP</a>]
+        [<a 
href="http://www.apache.org/dist/struts/examples/struts-2.3.16.1-apps.zip.md5";>MD5</a>]
       </li>
     </ul>
   </li>
   <li>Essential Dependencies Only:
     <ul>
       <li>
-        <a 
href="[preferred]/struts/library/struts-2.3.16-lib.zip">struts-2.3.16-lib.zip</a>
 (19MB)
-        [<a 
href="http://www.apache.org/dist/struts/library/struts-2.3.16-lib.zip.asc";>PGP</a>]
-        [<a 
href="http://www.apache.org/dist/struts/library/struts-2.3.16-lib.zip.md5";>MD5</a>]
+        <a 
href="[preferred]/struts/library/struts-2.3.16.1-lib.zip">struts-2.3.16.1-lib.zip</a>
 (19MB)
+        [<a 
href="http://www.apache.org/dist/struts/library/struts-2.3.16.1-lib.zip.asc";>PGP</a>]
+        [<a 
href="http://www.apache.org/dist/struts/library/struts-2.3.16.1-lib.zip.md5";>MD5</a>]
       </li>
     </ul>
   </li>
@@ -212,18 +212,18 @@
   <li>Documentation:
     <ul>
       <li>
-        <a 
href="[preferred]/struts/documentation/struts-2.3.16-docs.zip">struts-2.3.16-docs.zip</a>
 (13MB)
-        [<a 
href="http://www.apache.org/dist/struts/documentation/struts-2.3.16-docs.zip.asc";>PGP</a>]
-        [<a 
href="http://www.apache.org/dist/struts/documentation/struts-2.3.16-docs.zip.md5";>MD5</a>]
+        <a 
href="[preferred]/struts/documentation/struts-2.3.16.1-docs.zip">struts-2.3.16.1-docs.zip</a>
 (13MB)
+        [<a 
href="http://www.apache.org/dist/struts/documentation/struts-2.3.16.1-docs.zip.asc";>PGP</a>]
+        [<a 
href="http://www.apache.org/dist/struts/documentation/struts-2.3.16.1-docs.zip.md5";>MD5</a>]
       </li>
     </ul>
   </li>
   <li>Source:
     <ul>
       <li>
-        <a 
href="[preferred]/struts/source/struts-2.3.16-src.zip">struts-2.3.16-src.zip</a>
 (7MB)
-        [<a 
href="http://www.apache.org/dist/struts/source/struts-2.3.16-src.zip.asc";>PGP</a>]
-        [<a 
href="http://www.apache.org/dist/struts/source/struts-2.3.16-src.zip.md5";>MD5</a>]
+        <a 
href="[preferred]/struts/source/struts-2.3.16.1-src.zip">struts-2.3.16.1-src.zip</a>
 (7MB)
+        [<a 
href="http://www.apache.org/dist/struts/source/struts-2.3.16.1-src.zip.asc";>PGP</a>]
+        [<a 
href="http://www.apache.org/dist/struts/source/struts-2.3.16.1-src.zip.md5";>MD5</a>]
       </li>
     </ul>
   </li>

Modified: struts/site/trunk/content/downloads.html
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/downloads.html?rev=1574782&r1=1574781&r2=1574782&view=diff
==============================================================================
--- struts/site/trunk/content/downloads.html (original)
+++ struts/site/trunk/content/downloads.html Thu Mar  6 07:03:48 2014
@@ -131,7 +131,7 @@
     <strong>General Availability (GA) Releases</strong> - <em>Ready for Prime 
Time!</em>
     <ul>
       <li>
-        <a href="http://struts.apache.org/download.cgi#struts2316";>Struts 
2.3.16</a> ("best available")
+        <a href="http://struts.apache.org/download.cgi#struts23161";>Struts 
2.3.16.1</a> ("best available")
       </li>
     </ul>
   </li>
@@ -205,10 +205,24 @@
 <tbody>
 <tr>
   <td class="no-wrap">
+    <a href="http://struts.apache.org/2.3.16/index.html";>Struts 2.3.16</a>
+  </td>
+  <td class="no-wrap">8 December 2013</td>
+  <td>
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
+  </td>
+  <td>
+    <a 
href="http://struts.apache.org/2.x/docs/version-notes-23153.html";>Version 
notes</a>
+  </td>
+</tr>
+<tr>
+  <td class="no-wrap">
     <a href="http://struts.apache.org/2.3.15/index.html";>Struts 2.3.15.3</a>
   </td>
   <td class="no-wrap">15 October 2013</td>
-  <td><br/></td>
+  <td>
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
+  </td>
   <td>
     <a 
href="http://struts.apache.org/2.x/docs/version-notes-23153.html";>Version 
notes</a>
   </td>
@@ -219,7 +233,8 @@
   </td>
   <td class="no-wrap">16 July 2013</td>
   <td>
-    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.x/docs/version-notes-23152.html";>Version 
notes</a>
@@ -231,7 +246,8 @@
   </td>
   <td>16 July 2013</td>
   <td>
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.x/docs/version-notes-23151.html";>Version 
notes</a>
@@ -246,7 +262,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.x/docs/version-notes-2315.html";>Version 
notes</a>
@@ -261,7 +278,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.x/docs/version-notes-23143.html";>Version 
notes</a>
@@ -277,7 +295,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.x/docs/version-notes-23142.html";>Version 
notes</a>
@@ -294,7 +313,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.12/docs/version-notes-23141.html";>Version 
notes</a>
@@ -313,7 +333,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.12/docs/version-notes-2314.html";>Version 
notes</a>
@@ -332,7 +353,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.12/docs/version-notes-2312.html";>Version 
notes</a>
@@ -351,7 +373,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.8/docs/version-notes-238.html";>Version 
notes</a>
@@ -370,7 +393,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.7/docs/version-notes-237.html";>Version 
notes</a>
@@ -389,7 +413,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.4/docs/version-notes-234.html";>Version 
notes</a>
@@ -410,7 +435,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.4/docs/version-notes-234.html";>Version 
notes</a>
@@ -431,7 +457,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.3/docs/version-notes-233.html";>Version 
notes</a>
@@ -452,7 +479,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.1.2/docs/version-notes-2312.html";>Version 
notes</a>
@@ -474,7 +502,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.1.1/docs/version-notes-2311.html";>Version 
notes</a>
@@ -497,7 +526,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.1/docs/version-notes-231.html";>Version 
notes</a>
@@ -521,7 +551,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.2.3.1/docs/version-notes-2231.html";>Version 
notes</a>
@@ -546,7 +577,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.2.3/docs/version-notes-223.html";>Version 
notes</a>
@@ -572,7 +604,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.2.1.1/docs/version-notes-2211.html";>Version 
notes</a>
@@ -598,7 +631,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.2.1/docs/version-notes-221.html";>Version 
notes</a>
@@ -625,7 +659,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.1.8.1/docs/version-notes-2181.html";>Version 
notes</a>
@@ -652,7 +687,8 @@
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.1.8/docs/version-notes-218.html";>Version 
notes</a>

Modified: struts/site/trunk/content/index.html
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/content/index.html?rev=1574782&r1=1574781&r2=1574782&view=diff
==============================================================================
--- struts/site/trunk/content/index.html (original)
+++ struts/site/trunk/content/index.html Thu Mar  6 07:03:48 2014
@@ -115,7 +115,7 @@
       extensible using a plugin architecture, and ships with plugins to support
       REST, AJAX and JSON.
     </p>
-    <a href="http://struts.apache.org/download.cgi#struts2316"; class="btn 
btn-primary btn-large">Download</a>
+    <a href="http://struts.apache.org/download.cgi#struts23161"; class="btn 
btn-primary btn-large">Download</a>
     <a href="primer.html" class="btn btn-info btn-large">Technology Primer</a>
   </div>
 </div>
@@ -123,9 +123,10 @@
 <div class="container">
   <div class="row">
     <div class="col-md-4">
-      <h2>Struts 2.3.16 GA</h2>
-      <p>Apache Struts 2.3.16 GA has been released on 8 december 2013.</p>
-      <a 
href="http://struts.apache.org/release/2.3.x/docs/version-notes-2316.html";>Version
 notes</a>
+      <h2>Struts 2.3.16.1 GA</h2>
+      <p>Apache Struts 2.3.16.1 GA has been released on 8 december 2013.</p>
+      Read more in <a href="announce.html#a20131208">Announcement</a> or in
+      <a 
href="http://struts.apache.org/release/2.3.x/docs/version-notes-23161.html";>Version
 notes</a>
     </div>
     <div class="col-md-4">
       <h2>Immediately upgrade commons-fileupload!</h2>

Copied: struts/site/trunk/source/announce.md (from r1570474, 
struts/site/trunk/source/announce.html)
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/source/announce.md?p2=struts/site/trunk/source/announce.md&p1=struts/site/trunk/source/announce.html&r1=1570474&r2=1574782&rev=1574782&view=diff
==============================================================================
--- struts/site/trunk/source/announce.html (original)
+++ struts/site/trunk/source/announce.md Thu Mar  6 07:03:48 2014
@@ -3,52 +3,60 @@ layout: default
 title: Announcements
 ---
 
-<h1>Announcements</h1>
+# Announcements
 
 <p class="pull-right">
   Skip to: <a href="announce-2013.html">Announcements - 2013</a>
 </p>
 
-<h4 id="a20140221">21 February 2014 - Immediately upgrade commons-fileupload 
to version 1.3.1</h4>
-<p>
-  The Apache Struts Team recommends to immediately upgrade your Struts 2
-  based projects to use the latest released version of Commons
-  FileUpload library, which is currently 1.3.1. This is necessary to
-  prevent your publicly accessible web site from being exposed to
-  possible DoS attacks [1] [2].
-</p>
-<p>
-  Your project is affected if it uses the built-in file upload mechanism
-  of Struts 2, which defaults to the use of commons-fileupload. The
-  updated commons-fileupload library is a drop-in replacement for the
-  vulnerable version. Deployed applications can be hardened by replacing
-  the commons-fileupload jar file in WEB-INF/lib with the fixed jar. For
-  Maven based Struts 2 projects, the following dependency needs to be
-  added:
-</p>
-<pre>
-  &lt;dependency&gt;
-    &lt;groupId&gt;commons-fileupload&lt;/groupId&gt;
-    &lt;artifactId&gt;commons-fileupload&lt;/artifactId&gt;
-    &lt;version&gt;1.3.1&lt;/version&gt;
-  &lt;/dependency&gt;
-</pre>
-<p>
-  More details can be found here:
-  <ol>
-    <li>
-      <a 
href="http://commons.apache.org/proper/commons-fileupload/changes-report.html#a1.3.1";>
+#### <span id="a20140302"> 2 March 2014 - Struts 2.3.16.1 General Availability 
Release - Security Fix Release
+
+The Apache Struts group is pleased to announce that Struts 2.3.15.2 is 
available as a "General Availability"
+release. The GA designation is our highest quality grade.
+
+Apache Struts 2 is an elegant, extensible framework for creating 
enterprise-ready Java web applications.
+The framework is designed to streamline the full development cycle, from 
building, to deploying,
+to maintaining applications over time.
+
+Two security issues were solved with this release:
+
+  - [S2-020](http://struts.apache.org/release/2.3.x/docs/s2-020.html) 
ClassLoader manipulation
+    via request parameters
+  - [S2-020](http://struts.apache.org/release/2.3.x/docs/s2-020.html) Commons 
FileUpload library was upgraded
+    to version 1.3.1 to prevent DoS attacks
+
+All developers are strongly advised to perform this action.
+
+#### <span id="a20140221"> 21 February 2014 - Immediately upgrade 
commons-fileupload to version 1.3.1
+
+The Apache Struts Team recommends to immediately upgrade your Struts 2
+based projects to use the latest released version of Commons
+FileUpload library, which is currently 1.3.1. This is necessary to
+prevent your publicly accessible web site from being exposed to
+possible DoS attacks (see \[1] \[2]).
+
+Your project is affected if it uses the built-in file upload mechanism
+of Struts 2, which defaults to the use of commons-fileupload. The
+updated commons-fileupload library is a drop-in replacement for the
+vulnerable version. Deployed applications can be hardened by replacing
+the commons-fileupload jar file in WEB-INF/lib with the fixed jar. For
+Maven based Struts 2 projects, the following dependency needs to be
+added:
+
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.3.1</version>
+    </dependency>
+
+More details can be found here:
+
+  1. <a 
href="http://commons.apache.org/proper/commons-fileupload/changes-report.html#a1.3.1";>
       
http://commons.apache.org/proper/commons-fileupload/changes-report.html#a1.3.1</a>
-    </li>
-    <li>
-      <a 
href="http://mail-archives.apache.org/mod_mbox/www-announce/201402.mbox/%3c52f373fc.9030...@apache.org%3E";>
+  2. <a 
href="http://mail-archives.apache.org/mod_mbox/www-announce/201402.mbox/%3c52f373fc.9030...@apache.org%3E";>
       
http://mail-archives.apache.org/mod_mbox/www-announce/201402.mbox/%3c52f373fc.9030...@apache.org%3E</a>
-    </li>
-  </ol>
-</p>
-<p>
-  All developers are strongly advised to perform this action.
-</p>
+
+All developers are strongly advised to perform this action.
 
 <p class="pull-right">
   Skip to: <a href="announce-2013.html">Announcements - 2013</a>

Modified: struts/site/trunk/source/downloads.html
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/source/downloads.html?rev=1574782&r1=1574781&r2=1574782&view=diff
==============================================================================
--- struts/site/trunk/source/downloads.html (original)
+++ struts/site/trunk/source/downloads.html Thu Mar  6 07:03:48 2014
@@ -28,7 +28,7 @@ title: Releases
     <strong>General Availability (GA) Releases</strong> - <em>Ready for Prime 
Time!</em>
     <ul>
       <li>
-        <a href="http://struts.apache.org/download.cgi#struts{{ 
site.current_version_short }}">Struts 2.3.16</a> ("best available")
+        <a href="http://struts.apache.org/download.cgi#struts{{ 
site.current_version_short }}">Struts {{ site.current_version }}</a> ("best 
available")
       </li>
     </ul>
   </li>
@@ -102,10 +102,24 @@ title: Releases
 <tbody>
 <tr>
   <td class="no-wrap">
+    <a href="http://struts.apache.org/2.3.16/index.html";>Struts 2.3.16</a>
+  </td>
+  <td class="no-wrap">8 December 2013</td>
+  <td>
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
+  </td>
+  <td>
+    <a 
href="http://struts.apache.org/2.x/docs/version-notes-23153.html";>Version 
notes</a>
+  </td>
+</tr>
+<tr>
+  <td class="no-wrap">
     <a href="http://struts.apache.org/2.3.15/index.html";>Struts 2.3.15.3</a>
   </td>
   <td class="no-wrap">15 October 2013</td>
-  <td><br/></td>
+  <td>
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
+  </td>
   <td>
     <a 
href="http://struts.apache.org/2.x/docs/version-notes-23153.html";>Version 
notes</a>
   </td>
@@ -116,7 +130,8 @@ title: Releases
   </td>
   <td class="no-wrap">16 July 2013</td>
   <td>
-    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.x/docs/version-notes-23152.html";>Version 
notes</a>
@@ -128,7 +143,8 @@ title: Releases
   </td>
   <td>16 July 2013</td>
   <td>
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.x/docs/version-notes-23151.html";>Version 
notes</a>
@@ -143,7 +159,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.x/docs/version-notes-2315.html";>Version 
notes</a>
@@ -158,7 +175,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.x/docs/version-notes-23143.html";>Version 
notes</a>
@@ -174,7 +192,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.x/docs/version-notes-23142.html";>Version 
notes</a>
@@ -191,7 +210,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.12/docs/version-notes-23141.html";>Version 
notes</a>
@@ -210,7 +230,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.12/docs/version-notes-2314.html";>Version 
notes</a>
@@ -229,7 +250,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.12/docs/version-notes-2312.html";>Version 
notes</a>
@@ -248,7 +270,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.8/docs/version-notes-238.html";>Version 
notes</a>
@@ -267,7 +290,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.7/docs/version-notes-237.html";>Version 
notes</a>
@@ -286,7 +310,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.4/docs/version-notes-234.html";>Version 
notes</a>
@@ -307,7 +332,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.4/docs/version-notes-234.html";>Version 
notes</a>
@@ -328,7 +354,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.3/docs/version-notes-233.html";>Version 
notes</a>
@@ -349,7 +376,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.1.2/docs/version-notes-2312.html";>Version 
notes</a>
@@ -371,7 +399,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.1.1/docs/version-notes-2311.html";>Version 
notes</a>
@@ -394,7 +423,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.3.1/docs/version-notes-231.html";>Version 
notes</a>
@@ -418,7 +448,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.2.3.1/docs/version-notes-2231.html";>Version 
notes</a>
@@ -443,7 +474,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.2.3/docs/version-notes-223.html";>Version 
notes</a>
@@ -469,7 +501,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.2.1.1/docs/version-notes-2211.html";>Version 
notes</a>
@@ -495,7 +528,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.2.1/docs/version-notes-221.html";>Version 
notes</a>
@@ -522,7 +556,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.1.8.1/docs/version-notes-2181.html";>Version 
notes</a>
@@ -549,7 +584,8 @@ title: Releases
     <a href="http://struts.apache.org/2.x/docs/s2-016.html";>S2-016</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-017.html";>S2-017</a>,
     <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-018</a>,
-    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>
+    <a href="http://struts.apache.org/2.x/docs/s2-019.html";>S2-019</a>,
+    <a href="http://struts.apache.org/2.x/docs/s2-018.html";>S2-020</a>
   </td>
   <td>
     <a 
href="http://struts.apache.org/2.1.8/docs/version-notes-218.html";>Version 
notes</a>

Modified: struts/site/trunk/source/index.html
URL: 
http://svn.apache.org/viewvc/struts/site/trunk/source/index.html?rev=1574782&r1=1574781&r2=1574782&view=diff
==============================================================================
--- struts/site/trunk/source/index.html (original)
+++ struts/site/trunk/source/index.html Thu Mar  6 07:03:48 2014
@@ -21,7 +21,8 @@ title: Welcome to the Apache Struts proj
   <div class="row">
     <div class="col-md-4">
       <h2>Struts {{ site.current_version }} GA</h2>
-      <p>Apache Struts {{ site.current_version }} GA has been released on 8 
december 2013.</p>
+      <p>Apache Struts {{ site.current_version }} GA has been released on {{ 
site.release_date }}.</p>
+      Read more in <a href="announce.html#a{{ site.release_date_short 
}}">Announcement</a> or in
       <a href="http://struts.apache.org/release/2.3.x/docs/version-notes-{{ 
site.current_version_short }}.html">Version notes</a>
     </div>
     <div class="col-md-4">

Reply via email to