From 2d99f90d2c802ccfe6916e31b591d3a628faee52 Mon Sep 17 00:00:00 2001
From: Matei Alexandru Zaharia <matei@apache.org>
Date: Fri, 18 Jul 2014 20:52:58 +0000
Subject: Added Summit 2014 training links

---
 documentation.md | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'documentation.md')

diff --git a/documentation.md b/documentation.md
index d9378a64a..0024e48dd 100644
--- a/documentation.md
+++ b/documentation.md
@@ -91,16 +91,11 @@ In addition to the videos listed below, you can also view <a href="http://www.me
 </ul>
 
 
-<h3>Hands-On Exercises</h3>
-
-<ul>
-  <li><a href="http://spark-summit.org/2013/exercises/">Hands-on exercises</a> are available online from Spark Summit 2013. These exercises let you launch a small EC2 cluster, load a dataset, and query it with Spark, Shark, Spark Streaming, and MLlib.</li>
-</ul>
-
 <a name="summit"></a>
 <h3>Training Materials</h3>
 <ul>
-  <li>The 2nd day of <a href="http://spark-summit.org/2013">Spark Summit 2013</a> was a training session, and you can find the slides and videos from that inline in <a href="http://spark-summit.org/summit-2013/#agendapluginwidget-5">the training day agenda</a>.
+  <li><a href="http://spark-summit.org/2014/training">Training materials and exercises from Spark Summit 2014</a> are available online. These include videos and slides of talks as well as exercises you can run on your laptop. Topics include Spark core, tuning and debugging, Spark SQL, Spark Streaming, GraphX and MLlib.</li>
+  <li><a href="http://spark-summit.org/2013">Spark Summit 2013</a> included a training session, with slides and videos available on <a href="http://spark-summit.org/summit-2013/#agendapluginwidget-5">the training day agenda</a>.
     The session also included <a href="http://spark-summit.org/2013/exercises/">exercises</a> that you can walk through yourself, which will guide you through launching a Spark cluster on EC2 and using various Spark components to analyze real data.</li>
   <li>The <a href="https://amplab.cs.berkeley.edu/">UC Berkeley AMPLab</a> regularly hosts training camps on Spark and related projects.
 Slides, videos and EC2-based exercises from each of these are available online:
@@ -113,6 +108,14 @@ Slides, videos and EC2-based exercises from each of these are available online:
   </li>
 </ul>
 
+
+<h3>Hands-On Exercises</h3>
+
+<ul>
+  <li><a href="http://spark-summit.org/2014/training">Hands-on exercises from Spark Summit 2014</a>. These let you install Spark on your laptop and learn basic concepts, Spark SQL, Spark Streaming, GraphX and MLlib.</li>
+  <li><a href="http://spark-summit.org/2013/exercises/">Hands-on exercises from Spark Summit 2013</a>. These exercises let you launch a small EC2 cluster, load a dataset, and query it with Spark, Shark, Spark Streaming, and MLlib.</li>
+</ul>
+
 <h3>External Tutorials, Blog Posts, and Talks</h3>
 
 <ul>
-- 
cgit v1.2.3