summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Konwinski <andrew@apache.org>2014-04-21 18:53:37 +0000
committerAndy Konwinski <andrew@apache.org>2014-04-21 18:53:37 +0000
commitfd77adadc4edd7f315363dde7793d9604f316907 (patch)
tree9ce610ce414e4eb38acfa85eeb4058afc7a5f392
parent9b2208823451712551372c7408d0cb5d6e0ae6c0 (diff)
downloadspark-website-fd77adadc4edd7f315363dde7793d9604f316907.tar.gz
spark-website-fd77adadc4edd7f315363dde7793d9604f316907.tar.bz2
spark-website-fd77adadc4edd7f315363dde7793d9604f316907.zip
move screencasts to top of video section, remove duplicate link to external blog, add training video to summit video section, tweak some wording
-rw-r--r--documentation.md38
-rw-r--r--site/documentation.html38
2 files changed, 36 insertions, 40 deletions
diff --git a/documentation.md b/documentation.md
index 38cccb405..08aebf3ad 100644
--- a/documentation.md
+++ b/documentation.md
@@ -18,16 +18,24 @@ navigation:
<li><a href="{{site.url}}docs/0.6.2/">Spark 0.6.2</a></li>
</ul>
-<p>Read these documents to get started with Spark, as well as with the built-in components
-(<a href="{{site.url}}docs/latest/mllib-guide.html">MLlib</a> and
-<a href="{{site.url}}docs/latest/streaming-programming-guide.html">Spark Streaming</a>).</p>
+<p>The documentation linked to above covers getting started with Spark, as well the built-in components <a href="{{site.url}}docs/latest/mllib-guide.html">MLlib</a>,
+<a href="{{site.url}}docs/latest/streaming-programming-guide.html">Spark Streaming</a>, and <a href="{{site.url}}docs/latest/graphx-guide.html">GraphX</a>.</p>
-<p>In addition, this page lists some external resources for learning Spark.</p>
+<p>In addition, this page lists other resources for learning Spark.</p>
<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.
+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 videos of different topics. Besides browsing through playlists, you can also find direct links to videos below.
-<h4>Spark Summits</h4>
+<h4>Screencast Tutorial Videos</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>
+<li><a href="{{site.url}}screencasts/3-transformations-and-caching.html">Screencast 3: Transformations and Caching</a></li>
+<li><a href="{{site.url}}screencasts/4-a-standalone-job-in-spark.html">Screencast 4: A Spark Standalone Job in Scala</a></li>
+
+</ul>
+
+<h4>Spark Summit Videos</h4>
<ul>
<li>Videos from Spark Summit 2013, San Francisco, Dec 2-3 2013
<ul>
@@ -35,19 +43,11 @@ See the <a href="http://www.youtube.com/channel/UCRzsq7k4-kT-h3TDUBQ82-w">Apache
<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>
+ <li><a href="http://www.youtube.com/playlist?list=PL-x35fyliRwjR1Umntxz52zv3EcKpbzCp">YouTube playist of the Training Day (i.e. the 2nd day of the summit)</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>
-<li><a href="{{site.url}}screencasts/3-transformations-and-caching.html">Screencast 3: Transformations and Caching</a></li>
-<li><a href="{{site.url}}screencasts/4-a-standalone-job-in-spark.html">Screencast 4: A Spark Standalone Job in Scala</a></li>
-
-</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>
@@ -66,11 +66,10 @@ See the <a href="http://www.youtube.com/channel/UCRzsq7k4-kT-h3TDUBQ82-w">Apache
<a name="summit"></a>
<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/#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 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>.
+ 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 are available online:
+Slides, videos and EC2-based exercises from each of these are available online:
<ul>
<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>
@@ -84,7 +83,6 @@ Slides, videos and EC2-based exercises are available online:
<ul>
<li><a href="http://engineering.ooyala.com/blog/using-parquet-and-scrooge-spark">Using Parquet and Scrooge with Spark</a> &mdash; Scala-friendly Parquet and Avro usage tutorial from Ooyala's Evan Chan</li>
- <li><a href="http://engineering.ooyala.com/blog/using-parquet-and-scrooge-spark">Using Parquet and Scrooge with Spark</a> &mdash; Scala-friendly Parquet and Avro usage tutorial from Ooyala's Evan Chan</li>
<li><a href="http://codeforhire.com/2014/02/18/using-spark-with-mongodb/">Using Spark with MongoDB</a> &mdash; by Sampo Niskanen from Wellmo</li>
<li><a href="http://spark-summit.org/2013">Spark Summit 2013</a> &mdash; contained 30 talks about Spark use cases, available as slides and videos</li>
<li><a href="http://www.pwendell.com/2013/09/28/declarative-streams.html">Sampling Twitter Using Declarative Streams</a> &mdash; Spark Streaming tutorial by Patrick Wendell</li>
diff --git a/site/documentation.html b/site/documentation.html
index 66235cd17..5988fdc3e 100644
--- a/site/documentation.html
+++ b/site/documentation.html
@@ -168,16 +168,24 @@
<li><a href="/docs/0.6.2/">Spark 0.6.2</a></li>
</ul>
-<p>Read these documents to get started with Spark, as well as with the built-in components
-(<a href="/docs/latest/mllib-guide.html">MLlib</a> and
-<a href="/docs/latest/streaming-programming-guide.html">Spark Streaming</a>).</p>
+<p>The documentation linked to above covers getting started with Spark, as well the built-in components <a href="/docs/latest/mllib-guide.html">MLlib</a>,
+<a href="/docs/latest/streaming-programming-guide.html">Spark Streaming</a>, and <a href="/docs/latest/graphx-guide.html">GraphX</a>.</p>
-<p>In addition, this page lists some external resources for learning Spark.</p>
+<p>In addition, this page lists other resources for learning Spark.</p>
<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>
+<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 videos of different topics. Besides browsing through playlists, you can also find direct links to videos below.</p>
-<h4>Spark Summits</h4>
+<h4>Screencast Tutorial Videos</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>
+<li><a href="/screencasts/3-transformations-and-caching.html">Screencast 3: Transformations and Caching</a></li>
+<li><a href="/screencasts/4-a-standalone-job-in-spark.html">Screencast 4: A Spark Standalone Job in Scala</a></li>
+
+</ul>
+
+<h4>Spark Summit Videos</h4>
<ul>
<li>Videos from Spark Summit 2013, San Francisco, Dec 2-3 2013
<ul>
@@ -185,19 +193,11 @@
<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>
+ <li><a href="http://www.youtube.com/playlist?list=PL-x35fyliRwjR1Umntxz52zv3EcKpbzCp">YouTube playist of the Training Day (i.e. the 2nd day of the summit)</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>
-<li><a href="/screencasts/3-transformations-and-caching.html">Screencast 3: Transformations and Caching</a></li>
-<li><a href="/screencasts/4-a-standalone-job-in-spark.html">Screencast 4: A Spark Standalone Job in Scala</a></li>
-
-</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>
@@ -215,11 +215,10 @@
<p><a name="summit"></a></p>
<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/#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 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>.
+ 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 are available online:
+Slides, videos and EC2-based exercises from each of these are available online:
<ul>
<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>
@@ -233,7 +232,6 @@ Slides, videos and EC2-based exercises are available online:
<ul>
<li><a href="http://engineering.ooyala.com/blog/using-parquet-and-scrooge-spark">Using Parquet and Scrooge with Spark</a> &mdash; Scala-friendly Parquet and Avro usage tutorial from Ooyala's Evan Chan</li>
- <li><a href="http://engineering.ooyala.com/blog/using-parquet-and-scrooge-spark">Using Parquet and Scrooge with Spark</a> &mdash; Scala-friendly Parquet and Avro usage tutorial from Ooyala's Evan Chan</li>
<li><a href="http://codeforhire.com/2014/02/18/using-spark-with-mongodb/">Using Spark with MongoDB</a> &mdash; by Sampo Niskanen from Wellmo</li>
<li><a href="http://spark-summit.org/2013">Spark Summit 2013</a> &mdash; contained 30 talks about Spark use cases, available as slides and videos</li>
<li><a href="http://www.pwendell.com/2013/09/28/declarative-streams.html">Sampling Twitter Using Declarative Streams</a> &mdash; Spark Streaming tutorial by Patrick Wendell</li>