From 477178c7db5c8f4418c0d1e8dcdab59ca0fa9435 Mon Sep 17 00:00:00 2001
From: Matei Alexandru Zaharia <matei@apache.org>
Date: Tue, 17 Jun 2014 21:04:46 +0000
Subject: tweaks to docs and summit reminder

---
 site/news/spark-and-shark-in-the-news.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'site/news/spark-and-shark-in-the-news.html')

diff --git a/site/news/spark-and-shark-in-the-news.html b/site/news/spark-and-shark-in-the-news.html
index 6cd1c7ea5..64d6963a3 100644
--- a/site/news/spark-and-shark-in-the-news.html
+++ b/site/news/spark-and-shark-in-the-news.html
@@ -96,7 +96,7 @@
         </a>
         <ul class="dropdown-menu">
           <li><a href="/documentation.html">Overview</a></li>
-          <li><a href="/docs/latest/">Latest Release</a></li>
+          <li><a href="/docs/latest/">Latest Release (Spark 1.0)</a></li>
           <li><a href="/examples.html">Examples</a></li>
         </ul>
       </li>
@@ -124,6 +124,9 @@
       <h5>Latest News</h5>
       <ul class="list-unstyled">
         
+          <li><a href="/news/two-weeks-to-spark-summit-2014.html">Two weeks to Spark Summit 2014</a>
+          <span class="small">(Jun 16, 2014)</span></li>
+        
           <li><a href="/news/spark-1-0-0-released.html">Spark 1.0.0 released</a>
           <span class="small">(May 30, 2014)</span></li>
         
@@ -133,9 +136,6 @@
           <li><a href="/news/spark-0-9-1-released.html">Spark 0.9.1 released</a>
           <span class="small">(Apr 09, 2014)</span></li>
         
-          <li><a href="/news/submit-talks-to-spark-summit-2014.html">Submissions and registration open for Spark Summit 2014</a>
-          <span class="small">(Mar 20, 2014)</span></li>
-        
       </ul>
       <p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
     </div>
@@ -160,7 +160,7 @@
     <h2>Spark and Shark in the news</h2>
 
 
-<p>Recently, we&#8217;ve seen quite a bit of coverage of both Spark and <a href="http://shark.cs.berkeley.edu">Shark</a> in the news. I wanted to list some of the more recent articles, for readers interested in learning more.</p>
+<p>Recently, we’ve seen quite a bit of coverage of both Spark and <a href="http://shark.cs.berkeley.edu">Shark</a> in the news. I wanted to list some of the more recent articles, for readers interested in learning more.</p>
 
 <ul>
 <li>Curt Monash, editor of the popular DBMS2 blog, wrote a great <a href="http://www.dbms2.com/2012/12/13/introduction-to-spark-shark-bdas-and-amplab/">introduction to Spark and Shark</a>, as well as a more detailed <a href="http://www.dbms2.com/2012/12/13/spark-shark-and-rdds-technology-notes/">technical overview</a>.</li>
@@ -170,7 +170,7 @@
 <li><a href="http://data-informed.com/spark-an-open-source-engine-for-iterative-data-mining/">DataInformed</a> interviewed two Spark users and wrote about their applications in anomaly detection, predictive analytics and data mining.</li>
 </ul>
 
-<p>In other news, there will be a full day of tutorials on Spark and Shark at the <a href="http://strataconf.com/strata2013">O&#8217;Reilly Strata conference</a> in February. They include a three-hour <a href="http://strataconf.com/strata2013/public/schedule/detail/27438">introduction to Spark, Shark and BDAS</a> Tuesday morning, and a three-hour <a href="http://strataconf.com/strata2013/public/schedule/detail/27440">hands-on exercise session</a>. </p>
+<p>In other news, there will be a full day of tutorials on Spark and Shark at the <a href="http://strataconf.com/strata2013">O’Reilly Strata conference</a> in February. They include a three-hour <a href="http://strataconf.com/strata2013/public/schedule/detail/27438">introduction to Spark, Shark and BDAS</a> Tuesday morning, and a three-hour <a href="http://strataconf.com/strata2013/public/schedule/detail/27440">hands-on exercise session</a>. </p>
 
 
 <p>
-- 
cgit v1.2.3