make videos a section with subsections for summit videos, screencasts, and meetup videos

2 files changed, 57 insertions, 12 deletions

diff --git a/documentation.md b/documentation.md
index cc48409f1..38cccb405 100644
--- a/documentation.md
+++ b/documentation.md
@@ -24,8 +24,22 @@ navigation:
 
 <p>In addition, this page lists some external resources for learning Spark.</p>
 
-<h3>Video Tutorials</h3>
+<h3>Videos</h3>
+See the <a href="http://www.youtube.com/channel/UCRzsq7k4-kT-h3TDUBQ82-w">Apache Spark YouTube Channel</a> for videos from Spark events. There are separate <a href="http://www.youtube.com/channel/UCRzsq7k4-kT-h3TDUBQ82-w/playlists">playlists</a> for different video types. Below, we provide direct links to videos.
 
+<h4>Spark Summits</h4>
+<ul>
+  <li>Videos from Spark Summit 2013, San Francisco, Dec 2-3 2013
+    <ul>
+      <li>See the <a href="http://spark-summit.org/2013#agendapluginwidget-4">event agenda</a> for the full agenda with inline links to all videos and slides</li>
+      <li><a href="http://www.youtube.com/playlist?list=PL-x35fyliRwjXj33QvAXN0Vlx0gc6u0je">YouTube playist of all Keynotes</a></li>
+      <li><a href="http://www.youtube.com/playlist?list=PL-x35fyliRwiNcKwIkDEQZBejiqxEJ79U">YouTube playist of Track A (Spark Applications)</a></li>
+      <li><a href="http://www.youtube.com/playlist?list=PL-x35fyliRwiNcKwIkDEQZBejiqxEJ79U">YouTube playist of Track B (Spark Deployment, Scheduling & Perf, Related projects)</a></li>
+    </ul>
+  </li>
+</ul>
+
+<h4>Screencast Tutorials</h4>
 <ul>
   <li><a href="{{site.url}}screencasts/1-first-steps-with-spark.html">Screencast 1: First Steps with Spark</a></li>
   <li><a href="{{site.url}}screencasts/2-spark-documentation-overview.html">Screencast 2: Spark Documentation Overview</a></li>
@@ -34,6 +48,15 @@ navigation:
 
 </ul>
 
+<h4>Meetup Talk Videos</h4>
+<ul>
+  <li><a href="http://www.youtube.com/watch?v=ju2OQEXqONU&list=PL-x35fyliRwiP3YteXbnhk0QGOtYLBT3a">Adding Native SQL Support to Spark with Catalyst</a> (<a href="http://files.meetup.com/3138542/Spark%20SQL%20Meetup%20-%204-8-2012.pdf">slides</a>) by Michael Armbrust, at Tagged in San Francisco, 2014-04-08</li>
+  <li><a href="http://www.youtube.com/watch?v=MY0NkZY_tJw&list=PL-x35fyliRwiP3YteXbnhk0QGOtYLBT3a">SparkR and GraphX</a> (<a href="http://files.meetup.com/3138542/SparkR-meetup.pdf">SparkR slides</a>, <a href="http://files.meetup.com/3138542/graphx%40spark_meetup03_2014.pdf">GraphX slides</a>) by Shivaram Venkataraman &amp; Dan Crankshaw, at SkyDeck in Berkeley, 2014-03-25</li>
+  <li><a href="http://www.youtube.com/watch?v=5niXiiEX5pE&list=PL-x35fyliRwiP3YteXbnhk0QGOtYLBT3a">Simple deployment with SIMR and Advanced Shark Analytics with TGFs</a> (<a href="http://files.meetup.com/3138542/tgf.pptx">slides</a>) by Ali Ghodsi, at Huawei in Santa Clara, 2014-02-05</li>
+  <li><a href="http://www.youtube.com/watch?v=C7gWtxelYNM&list=PL-x35fyliRwiP3YteXbnhk0QGOtYLBT3a">Stores, Monoids and Dependency Injection - Abstractions for Spark</a> (<a href="http://files.meetup.com/3138542/Abstractions%20for%20spark%20streaming%20-%20spark%20meetup%20presentation.pdf">slides</a>) by Ryan Weald, at Sharethrough in San Francisco, 2014-01-17</li>
+</ul>
+
+
 <h3>Hands-On Exercises</h3>
 
 <ul>
@@ -44,15 +67,15 @@ navigation:
 <h3>Training Materials</h3>
 <ul>
   <li><a href="http://spark-summit.org/2013">Spark Summit 2013</a> contained a training session for which
-    <a href="http://spark-summit.org/summit-2013/#day2">slides and videos</a> are available for free online.
+    <a href="http://spark-summit.org/summit-2013/#agendapluginwidget-5">slides and videos</a> are available for free online.
     The session also included <a href="http://spark-summit.org/2013/exercises/">exercises</a> that you can run on Amazon EC2.</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 are available online:
 <ul>
-    <li><a href="http://ampcamp.berkeley.edu/4/">AMP Camp Four</a> (Strata Santa Clara, February 2013) &mdash; focused on new components of the Spark stack</li>
-    <li><a href="http://ampcamp.berkeley.edu/3/">AMP Camp Three</a> (Berkeley, CA, August 2013)</li>
-    <li><a href="http://ampcamp.berkeley.edu/amp-camp-two-strata-2013/">AMP Camp Two</a> (Strata Santa Clara, February 2013)</li>
-    <li><a href="http://ampcamp.berkeley.edu/agenda-2012/">AMP Camp One</a> (Berkeley, CA, August 2012)</li>
+    <li><a href="http://ampcamp.berkeley.edu/4/">AMP Camp 4</a> (Strata Santa Clara, Feb 2014) &mdash; focus on BlinkDB, MLlib, GraphX, Tachyon</li>
+    <li><a href="http://ampcamp.berkeley.edu/3/">AMP Camp 3</a> (Berkeley, CA, Aug 2013)</li>
+    <li><a href="http://ampcamp.berkeley.edu/amp-camp-two-strata-2013/">AMP Camp 2</a> (Strata Santa Clara, Feb 2013)</li>
+    <li><a href="http://ampcamp.berkeley.edu/agenda-2012/">AMP Camp 1</a> (Berkeley, CA, Aug 2012)</li>
     </ul>
   </li>
 </ul>
diff --git a/site/documentation.html b/site/documentation.html
index b8041aedf..66235cd17 100644
--- a/site/documentation.html
+++ b/site/documentation.html
@@ -174,8 +174,22 @@
 
 <p>In addition, this page lists some external resources for learning Spark.</p>
 
-<h3>Video Tutorials</h3>
+<h3>Videos</h3>
+<p>See the <a href="http://www.youtube.com/channel/UCRzsq7k4-kT-h3TDUBQ82-w">Apache Spark YouTube Channel</a> for videos from Spark events. There are separate <a href="http://www.youtube.com/channel/UCRzsq7k4-kT-h3TDUBQ82-w/playlists">playlists</a> for different video types. Below, we provide direct links to videos.</p>
 
+<h4>Spark Summits</h4>
+<ul>
+  <li>Videos from Spark Summit 2013, San Francisco, Dec 2-3 2013
+    <ul>
+      <li>See the <a href="http://spark-summit.org/2013#agendapluginwidget-4">event agenda</a> for the full agenda with inline links to all videos and slides</li>
+      <li><a href="http://www.youtube.com/playlist?list=PL-x35fyliRwjXj33QvAXN0Vlx0gc6u0je">YouTube playist of all Keynotes</a></li>
+      <li><a href="http://www.youtube.com/playlist?list=PL-x35fyliRwiNcKwIkDEQZBejiqxEJ79U">YouTube playist of Track A (Spark Applications)</a></li>
+      <li><a href="http://www.youtube.com/playlist?list=PL-x35fyliRwiNcKwIkDEQZBejiqxEJ79U">YouTube playist of Track B (Spark Deployment, Scheduling &amp; Perf, Related projects)</a></li>
+    </ul>
+  </li>
+</ul>
+
+<h4>Screencast Tutorials</h4>
 <ul>
   <li><a href="/screencasts/1-first-steps-with-spark.html">Screencast 1: First Steps with Spark</a></li>
   <li><a href="/screencasts/2-spark-documentation-overview.html">Screencast 2: Spark Documentation Overview</a></li>
@@ -184,6 +198,14 @@
 
 </ul>
 
+<h4>Meetup Talk Videos</h4>
+<ul>
+  <li><a href="http://www.youtube.com/watch?v=ju2OQEXqONU&amp;list=PL-x35fyliRwiP3YteXbnhk0QGOtYLBT3a">Adding Native SQL Support to Spark with Catalyst</a> (<a href="http://files.meetup.com/3138542/Spark%20SQL%20Meetup%20-%204-8-2012.pdf">slides</a>) by Michael Armbrust, at Tagged in San Francisco, 2014-04-08</li>
+  <li><a href="http://www.youtube.com/watch?v=MY0NkZY_tJw&amp;list=PL-x35fyliRwiP3YteXbnhk0QGOtYLBT3a">SparkR and GraphX</a> (<a href="http://files.meetup.com/3138542/SparkR-meetup.pdf">SparkR slides</a>, <a href="http://files.meetup.com/3138542/graphx%40spark_meetup03_2014.pdf">GraphX slides</a>) by Shivaram Venkataraman &amp; Dan Crankshaw, at SkyDeck in Berkeley, 2014-03-25</li>
+  <li><a href="http://www.youtube.com/watch?v=5niXiiEX5pE&amp;list=PL-x35fyliRwiP3YteXbnhk0QGOtYLBT3a">Simple deployment with SIMR and Advanced Shark Analytics with TGFs</a> (<a href="http://files.meetup.com/3138542/tgf.pptx">slides</a>) by Ali Ghodsi, at Huawei in Santa Clara, 2014-02-05</li>
+  <li><a href="http://www.youtube.com/watch?v=C7gWtxelYNM&amp;list=PL-x35fyliRwiP3YteXbnhk0QGOtYLBT3a">Stores, Monoids and Dependency Injection - Abstractions for Spark</a> (<a href="http://files.meetup.com/3138542/Abstractions%20for%20spark%20streaming%20-%20spark%20meetup%20presentation.pdf">slides</a>) by Ryan Weald, at Sharethrough in San Francisco, 2014-01-17</li>
+</ul>
+
 <h3>Hands-On Exercises</h3>
 
 <ul>
@@ -194,15 +216,15 @@
 <h3>Training Materials</h3>
 <ul>
   <li><a href="http://spark-summit.org/2013">Spark Summit 2013</a> contained a training session for which
-    <a href="http://spark-summit.org/summit-2013/#day2">slides and videos</a> are available for free online.
+    <a href="http://spark-summit.org/summit-2013/#agendapluginwidget-5">slides and videos</a> are available for free online.
     The session also included <a href="http://spark-summit.org/2013/exercises/">exercises</a> that you can run on Amazon EC2.</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 are available online:
 <ul>
-    <li><a href="http://ampcamp.berkeley.edu/4/">AMP Camp Four</a> (Strata Santa Clara, February 2013) &mdash; focused on new components of the Spark stack</li>
-    <li><a href="http://ampcamp.berkeley.edu/3/">AMP Camp Three</a> (Berkeley, CA, August 2013)</li>
-    <li><a href="http://ampcamp.berkeley.edu/amp-camp-two-strata-2013/">AMP Camp Two</a> (Strata Santa Clara, February 2013)</li>
-    <li><a href="http://ampcamp.berkeley.edu/agenda-2012/">AMP Camp One</a> (Berkeley, CA, August 2012)</li>
+    <li><a href="http://ampcamp.berkeley.edu/4/">AMP Camp 4</a> (Strata Santa Clara, Feb 2014) &mdash; focus on BlinkDB, MLlib, GraphX, Tachyon</li>
+    <li><a href="http://ampcamp.berkeley.edu/3/">AMP Camp 3</a> (Berkeley, CA, Aug 2013)</li>
+    <li><a href="http://ampcamp.berkeley.edu/amp-camp-two-strata-2013/">AMP Camp 2</a> (Strata Santa Clara, Feb 2013)</li>
+    <li><a href="http://ampcamp.berkeley.edu/agenda-2012/">AMP Camp 1</a> (Berkeley, CA, Aug 2012)</li>
     </ul>
   </li>
 </ul>