svn commit: r990786 [4/4] - in /websites/production/struts/content: ./ docs/

[lukaszlenart]

Modified: websites/production/struts/content/index.html
==============================================================================
--- websites/production/struts/content/index.html (original)
+++ websites/production/struts/content/index.html Fri Jun 17 12:26:19 2016
@@ -145,45 +145,28 @@
         </p>
       </div>
       <div class="column col-md-4">
-        <h2>Apache Struts 2.5 GA</h2>
+        <h2>Apache Struts 2.3.29 GA</h2>
         <p>
-          Apache Struts 2.5 GA has been released<br/>on 9 may 2016.
+          It's the latest release of Struts 2.3.x,
+          read more in <a href="announce.html#a20160617">Announcement</a> or in
+          <a href="/docs/version-notes-2329.html">Version notes</a>
         </p>
-        Read more in <a href="announce.html#a20160509">Announcement</a> or in
-        <a href="/docs/version-notes-25.html">Version notes</a>
       </div>
       <div class="column col-md-4">
-        <h2>Apache Struts 2.3.28.1 GA</h2>
+        <h2>Apache Struts 2.5 GA</h2>
         <p>
-          It's the latest release of Struts 2.3.x,
-          read more in <a href="announce.html#aa20160419">Announcement</a> or 
in
-          <a href="/docs/version-notes-23281.html">Version notes</a>
+          Apache Struts 2.5 GA has been released<br/>on 9 may 2016.
         </p>
+        Read more in <a href="announce.html#a20160509">Announcement</a> or in
+        <a href="/docs/version-notes-25.html">Version notes</a>
       </div>
     </div>
     <div class="row">
       <div class="column col-md-4">
-        <h2>Apache Struts 2.3.20.3 & 2.3.24.3</h2>
-        <p>
-          We have released two older versions of Apache Struts which contain 
the latest security fixes.
-          Please read announcement for <a 
href="announce.html#a20160419-1">2.3.20.3 & 2.3.24.3</a>
-          and version notes for <a 
href="/docs/version-notes-23203.html">2.3.20.3</a> and
-          <a href="/docs/version-notes-23243.html">2.3.24.3</a>.
-        </p>
       </div>
       <div class="column col-md-4">
-        <h2>Security Bulletin S2-033 & S2-034</h2>
-        <p>
-          Two new Security Bulletins were published, please read more in the
-          <a href="announce.html#a20160601">Announcement</a>.
-        </p>
       </div>
       <div class="column col-md-4">
-        <h2>Security Bulletin S2-032</h2>
-        <p>
-          A new security bulletin was published, please carefully read the
-          <a href="/docs/s2-032.html">S2-032</a> bulletin.
-        </p>
       </div>
     </div>
   </div>

Modified: websites/production/struts/content/mail.html
==============================================================================
--- websites/production/struts/content/mail.html (original)
+++ websites/production/struts/content/mail.html Fri Jun 17 12:26:19 2016
@@ -150,29 +150,23 @@
   </tr>
 
   <tr>
-    <td>Struts-Announcements</td>
-    <td><a 
href="mailto:announcements-subscr...@struts.apache.org?subject=subscribe&amp;body=subscribe";>announcements-subscr...@struts.apache.org</a>
-    </td>
-    <td><a 
href="mailto:announcements-unsubscr...@struts.apache.org?subject=unsubscribe&amp;body=unsubscribe";>announcements-unsubscr...@struts.apache.org</a>
-    </td>
+    <td><a 
href="https://lists.apache.org/list.html?announceme...@struts.apache.org";>Struts-Announcements</a></td>
+    <td><a 
href="mailto:announcements-subscr...@struts.apache.org?subject=subscribe&amp;body=subscribe";>announcements-subscr...@struts.apache.org</a></td>
+    <td><a 
href="mailto:announcements-unsubscr...@struts.apache.org?subject=unsubscribe&amp;body=unsubscribe";>announcements-unsubscr...@struts.apache.org</a></td>
     <td>Major Announcements, low-volume, read only</td>
   </tr>
 
   <tr>
-    <td>Struts-User</td>
-    <td><a 
href="mailto:user-subscr...@struts.apache.org?subject=subscribe&amp;body=subscribe";>user-subscr...@struts.apache.org</a>
-    </td>
-    <td><a 
href="mailto:user-unsubscr...@struts.apache.org?subject=unsubscribe&amp;body=unsubscribe";>user-unsubscr...@struts.apache.org</a>
-    </td>
+    <td><a 
href="https://lists.apache.org/list.html?u...@struts.apache.org";>Struts-User</a></td>
+    <td><a 
href="mailto:user-subscr...@struts.apache.org?subject=subscribe&amp;body=subscribe";>user-subscr...@struts.apache.org</a></td>
+    <td><a 
href="mailto:user-unsubscr...@struts.apache.org?subject=unsubscribe&amp;body=unsubscribe";>user-unsubscr...@struts.apache.org</a></td>
     <td>Contact to other Struts-users and ask questions on installation or 
features</td>
   </tr>
 
   <tr>
     <td>Users Digest</td>
-    <td><a 
href="mailto:user-digest-subscr...@struts.apache.org?subject=subscribe&amp;body=subscribe";>user-digest-subscr...@struts.apache.org</a>
-    </td>
-    <td><a 
href="mailto:user-digest-unsubscr...@struts.apache.org?subject=unsubscribe&amp;body=unsubscribe";>user-digest-unsubscr...@struts.apache.org</a>
-    </td>
+    <td><a 
href="mailto:user-digest-subscr...@struts.apache.org?subject=subscribe&amp;body=subscribe";>user-digest-subscr...@struts.apache.org</a></td>
+    <td><a 
href="mailto:user-digest-unsubscr...@struts.apache.org?subject=unsubscribe&amp;body=unsubscribe";>user-digest-unsubscr...@struts.apache.org</a></td>
     <td>Get a daily digest of the Struts Users list</td>
   </tr>
 </table>