summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatei Alexandru Zaharia <matei@apache.org>2013-11-08 18:41:14 +0000
committerMatei Alexandru Zaharia <matei@apache.org>2013-11-08 18:41:14 +0000
commit4737d7e5c2c3ced88a5cc6f7a03d4fd5b78defc7 (patch)
tree827429b572346df670d1f392e522b4a682deef92
parent913fbdc9c6d9fc9a506d1973728836e841b4ab53 (diff)
downloadspark-website-4737d7e5c2c3ced88a5cc6f7a03d4fd5b78defc7.tar.gz
spark-website-4737d7e5c2c3ced88a5cc6f7a03d4fd5b78defc7.tar.bz2
spark-website-4737d7e5c2c3ced88a5cc6f7a03d4fd5b78defc7.zip
Fix presentations
-rw-r--r--documentation.md15
-rw-r--r--site/documentation.html15
2 files changed, 12 insertions, 18 deletions
diff --git a/documentation.md b/documentation.md
index bad74823d..06c16c806 100644
--- a/documentation.md
+++ b/documentation.md
@@ -47,15 +47,6 @@ Slides and videos from each camp are posted online:
</li>
</ul>
-<h3>Presentations</h3>
-
-<ul>
- <li>Programming Spark tutorial at AMP Camp: <a href="http://ampcamp.berkeley.edu/wp-content/uploads/2012/06/matei-zaharia-part-1-amp-camp-2012-spark-intro.pdf">part 1 (pdf)</a>, <a href="http://ampcamp.berkeley.edu/wp-content/uploads/2012/06/matei-zaharia-part-2-amp-camp-2012-standalone-programs.pdf">part 2 (pdf)</a>, <a href="http://www.youtube.com/watch?v=7k4yDKBYOcw">video</a>.
- </li>
- <li><a href="{{site.url}}talks/strata_spark_streaming.ppt">Overview of Spark Streaming</a> (<a href="{{site.url}}talks/strata_spark_streaming.ppt">ppt</a>) (<a href="{{site.url}}talks/strata_spark_streaming.pdf">pdf</a>)</li>
- <li><a href="http://www.youtube.com/watch?v=49Hr5xZyTEA">Overview of Spark Internals [advanced]</a> (<a href="{{site.url}}talks/dev-meetup-dec-2012.pptx">pptx</a>) (<a href="http://www.youtube.com/watch?v=49Hr5xZyTEA">video</a>)</li>
-</ul>
-
<h3>Books</h3>
<ul>
@@ -75,6 +66,12 @@ Slides and videos from each camp are posted online:
<li><a href="http://www.ibm.com/developerworks/library/os-spark/">Spark, an alternative for fast data analytics</a> -- IBM Developer Works article by M. Tim Jones</li>
</ul>
+<h3>Spark Internals</h3>
+
+<ul>
+ <li><a href="http://www.youtube.com/watch?v=49Hr5xZyTEA">Overview of Spark Internals [advanced]</a> (<a href="{{site.url}}talks/dev-meetup-dec-2012.pptx">pptx</a>) (<a href="http://www.youtube.com/watch?v=49Hr5xZyTEA">video</a>)</li>
+</ul>
+
<h3>Research Papers</h3>
<ul>
diff --git a/site/documentation.html b/site/documentation.html
index 6f1d59b01..ad1931101 100644
--- a/site/documentation.html
+++ b/site/documentation.html
@@ -167,15 +167,6 @@ Slides and videos from each camp are posted online:
</li>
</ul>
-<h3>Presentations</h3>
-
-<ul>
- <li>Programming Spark tutorial at AMP Camp: <a href="http://ampcamp.berkeley.edu/wp-content/uploads/2012/06/matei-zaharia-part-1-amp-camp-2012-spark-intro.pdf">part 1 (pdf)</a>, <a href="http://ampcamp.berkeley.edu/wp-content/uploads/2012/06/matei-zaharia-part-2-amp-camp-2012-standalone-programs.pdf">part 2 (pdf)</a>, <a href="http://www.youtube.com/watch?v=7k4yDKBYOcw">video</a>.
- </li>
- <li><a href="/talks/strata_spark_streaming.ppt">Overview of Spark Streaming</a> (<a href="/talks/strata_spark_streaming.ppt">ppt</a>) (<a href="/talks/strata_spark_streaming.pdf">pdf</a>)</li>
- <li><a href="http://www.youtube.com/watch?v=49Hr5xZyTEA">Overview of Spark Internals [advanced]</a> (<a href="/talks/dev-meetup-dec-2012.pptx">pptx</a>) (<a href="http://www.youtube.com/watch?v=49Hr5xZyTEA">video</a>)</li>
-</ul>
-
<h3>Books</h3>
<ul>
@@ -195,6 +186,12 @@ Slides and videos from each camp are posted online:
<li><a href="http://www.ibm.com/developerworks/library/os-spark/">Spark, an alternative for fast data analytics</a> -- IBM Developer Works article by M. Tim Jones</li>
</ul>
+<h3>Spark Internals</h3>
+
+<ul>
+ <li><a href="http://www.youtube.com/watch?v=49Hr5xZyTEA">Overview of Spark Internals [advanced]</a> (<a href="/talks/dev-meetup-dec-2012.pptx">pptx</a>) (<a href="http://www.youtube.com/watch?v=49Hr5xZyTEA">video</a>)</li>
+</ul>
+
<h3>Research Papers</h3>
<ul>