[tor-commits] r26212: {website} swap announcements and tor use cases, add the latest blog po (website/trunk/en)

[Andrew Lewman]

Author: phobos
Date: 2013-06-11 01:54:58 +0000 (Tue, 11 Jun 2013)
New Revision: 26212

Modified:
   website/trunk/en/index.wml
Log:
swap announcements and tor use cases, add the latest blog post to the announcements.


Modified: website/trunk/en/index.wml
===================================================================
--- website/trunk/en/index.wml	2013-06-10 14:39:54 UTC (rev 26211)
+++ website/trunk/en/index.wml	2013-06-11 01:54:58 UTC (rev 26212)
@@ -153,6 +153,44 @@
       </div>
       <!-- END MAINCOL -->
       <div id="sidecol">
+        <div id="home-announcements" class="clearfix">
+       	<h2>Announcements</h2>
+          <div class="fauxhead"></div>
+          <table>
+            <tr>
+              <td>
+                <div class="calendar"><span class="month">Jun</span><br><span class="day">10</span></div>
+                <p>Read our <a href="https://blog.torproject.org/blog/tors-response-prism-surveillance-program">response</a> to NSA PRISM and the Eric Snowden interview.</p>
+	      </td>
+	    </tr>
+            <tr>
+              <td>
+                <div class="calendar"><span class="month">Jun</span><br><span class="day">8</span></div>
+                <p>Read our <a href="https://blog.torproject.org/blog/prism-vs-tor">thoughts on the NSA PRISM</a> revelation and how it relates to Tor.</p>
+	      </td>
+	    </tr>
+            <tr>
+              <td>
+                <div class="calendar"><span class="month">Feb</span><br><span class="day">5</span></div>
+                <p>Read Roger's <a href="https://blog.torproject.org/blog/trip-report-tor-trainings-dutch-and-belgian-police">trip report about teaching
+                the Dutch and Belgian police about Tor</a>.</p>
+	      </td>
+	    </tr>
+            <tr>
+              <td>
+                <div class="calendar"><span class="month">Jan</span><br><span class="day">14</span></div>
+                <p>Combined flashproxy and pyobfsproxy bundles now available.
+                See <a href="https://blog.torproject.org/blog/combined-flash-proxy-pyobfsproxy-browser-bundles">the announcement</a> for details.</p>
+	      </td>
+	    </tr>
+	    <tr>
+	      <td>
+		<div class="calendar"><span class="month">Jan</span><br><span class="day">11</span></div>
+		<p>Tails, The Amnesic Incognito Live System, <a href="https://blog.torproject.org/blog/tails-016-out">version 0.16</a>, is now available.</p>
+	      </td>
+            </tr>
+          </table>
+        </div>
       	<div id="torusers">
           <h2>Who Uses Tor?</h2>
           <div class="user">
@@ -186,38 +224,6 @@
             <p>Militaries and law enforcement use Tor to protect their communications, investigations, and intelligence gathering online.</p>
           </div>
         </div>
-        <div id="home-announcements" class="clearfix">
-        	<h2>Announcements</h2>
-          <div class="fauxhead"></div>
-          <table>
-            <tr>
-              <td>
-                <div class="calendar"><span class="month">Jun</span><br><span class="day">8</span></div>
-                <p>Read our <a href="https://blog.torproject.org/blog/prism-vs-tor">thoughts on the NSA PRISM</a> revelation and how it relates to Tor.</p>
-	      </td>
-	    </tr>
-            <tr>
-              <td>
-                <div class="calendar"><span class="month">Feb</span><br><span class="day">5</span></div>
-                <p>Read Roger's <a href="https://blog.torproject.org/blog/trip-report-tor-trainings-dutch-and-belgian-police">trip report about teaching
-                the Dutch and Belgian police about Tor</a>.</p>
-	      </td>
-	    </tr>
-            <tr>
-              <td>
-                <div class="calendar"><span class="month">Jan</span><br><span class="day">14</span></div>
-                <p>Combined flashproxy and pyobfsproxy bundles now available.
-                See <a href="https://blog.torproject.org/blog/combined-flash-proxy-pyobfsproxy-browser-bundles">the announcement</a> for details.</p>
-	      </td>
-	    </tr>
-	    <tr>
-	      <td>
-		<div class="calendar"><span class="month">Jan</span><br><span class="day">11</span></div>
-		<p>Tails, The Amnesic Incognito Live System, <a href="https://blog.torproject.org/blog/tails-016-out">version 0.16</a>, is now available.</p>
-	      </td>
-            </tr>
-          </table>
-        </div>
         <!-- END TABLE -->
       </div>
       <!-- END SIDECOL -->