You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2014/05/31 05:21:27 UTC

svn commit: r1598804 [1/2] - in /spark: ./ _layouts/ graphx/ images/ releases/_posts/ site/ site/graphx/ site/images/ site/mllib/ site/news/ site/releases/ site/screencasts/ site/streaming/

Author: ankurdave
Date: Sat May 31 03:21:26 2014
New Revision: 1598804

URL: http://svn.apache.org/r1598804
Log:
Add a GraphX page at /graphx/

Added:
    spark/graphx/
    spark/graphx/index.md
    spark/images/graphx-perf-comparison.png   (with props)
    spark/site/graphx/
    spark/site/graphx/index.html
    spark/site/images/graphx-perf-comparison.png   (with props)
Modified:
    spark/_config.yml
    spark/_layouts/global.html
    spark/community.md
    spark/downloads.md
    spark/index.md
    spark/releases/_posts/2014-02-02-spark-release-0-9-0.md
    spark/site/community.html
    spark/site/documentation.html
    spark/site/downloads.html
    spark/site/examples.html
    spark/site/faq.html
    spark/site/index.html
    spark/site/mailing-lists.html
    spark/site/mllib/index.html
    spark/site/news/amp-camp-2013-registration-ope.html
    spark/site/news/announcing-the-first-spark-summit.html
    spark/site/news/fourth-spark-screencast-published.html
    spark/site/news/index.html
    spark/site/news/nsdi-paper.html
    spark/site/news/run-spark-and-shark-on-amazon-emr.html
    spark/site/news/spark-0-6-1-and-0-5-2-released.html
    spark/site/news/spark-0-6-2-released.html
    spark/site/news/spark-0-7-0-released.html
    spark/site/news/spark-0-7-2-released.html
    spark/site/news/spark-0-7-3-released.html
    spark/site/news/spark-0-8-0-released.html
    spark/site/news/spark-0-8-1-released.html
    spark/site/news/spark-0-9-0-released.html
    spark/site/news/spark-0-9-1-released.html
    spark/site/news/spark-1-0-0-released.html
    spark/site/news/spark-accepted-into-apache-incubator.html
    spark/site/news/spark-and-shark-in-the-news.html
    spark/site/news/spark-becomes-tlp.html
    spark/site/news/spark-featured-in-wired.html
    spark/site/news/spark-mailing-lists-moving-to-apache.html
    spark/site/news/spark-meetups.html
    spark/site/news/spark-screencasts-published.html
    spark/site/news/spark-summit-2013-is-a-wrap.html
    spark/site/news/spark-summit-agenda-posted.html
    spark/site/news/spark-tips-from-quantifind.html
    spark/site/news/spark-user-survey-and-powered-by-page.html
    spark/site/news/spark-version-0-6-0-released.html
    spark/site/news/strata-exercises-now-available-online.html
    spark/site/news/submit-talks-to-spark-summit-2014.html
    spark/site/news/video-from-first-spark-development-meetup.html
    spark/site/releases/spark-release-0-3.html
    spark/site/releases/spark-release-0-5-0.html
    spark/site/releases/spark-release-0-5-1.html
    spark/site/releases/spark-release-0-5-2.html
    spark/site/releases/spark-release-0-6-0.html
    spark/site/releases/spark-release-0-6-1.html
    spark/site/releases/spark-release-0-6-2.html
    spark/site/releases/spark-release-0-7-0.html
    spark/site/releases/spark-release-0-7-2.html
    spark/site/releases/spark-release-0-7-3.html
    spark/site/releases/spark-release-0-8-0.html
    spark/site/releases/spark-release-0-8-1.html
    spark/site/releases/spark-release-0-9-0.html
    spark/site/releases/spark-release-0-9-1.html
    spark/site/releases/spark-release-1-0-0.html
    spark/site/research.html
    spark/site/screencasts/1-first-steps-with-spark.html
    spark/site/screencasts/2-spark-documentation-overview.html
    spark/site/screencasts/3-transformations-and-caching.html
    spark/site/screencasts/4-a-standalone-job-in-spark.html
    spark/site/screencasts/index.html
    spark/site/streaming/index.html

Modified: spark/_config.yml
URL: http://svn.apache.org/viewvc/spark/_config.yml?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/_config.yml (original)
+++ spark/_config.yml Sat May 31 03:21:26 2014
@@ -14,4 +14,3 @@ keep_files: ['docs', '.svn']
 url: /
 
 shark_url: http://shark.cs.berkeley.edu
-graphx_url: http://amplab.github.io/graphx/

Modified: spark/_layouts/global.html
URL: http://svn.apache.org/viewvc/spark/_layouts/global.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/_layouts/global.html (original)
+++ spark/_layouts/global.html Sat May 31 03:21:26 2014
@@ -32,11 +32,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -102,7 +102,7 @@
           <li><a href="{{site.shark_url}}">Shark (SQL)</a></li>
           <li><a href="{{site.url}}streaming/">Spark Streaming</a></li>
           <li><a href="{{site.url}}mllib/">MLlib (machine learning)</a></li>
-          <li><a href="{{site.graphx_url}}">GraphX (graph)</a></li>
+          <li><a href="{{site.url}}graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -159,7 +159,7 @@
         <li><a href="{{site.shark_url}}">Shark (SQL)</a></li>
         <li><a href="{{site.url}}streaming/">Spark Streaming</a></li>
         <li><a href="{{site.url}}mllib/">MLlib (machine learning)</a></li>
-        <li><a href="{{site.graphx_url}}">GraphX (graph)</a></li>
+        <li><a href="{{site.url}}graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/community.md
URL: http://svn.apache.org/viewvc/spark/community.md?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/community.md (original)
+++ spark/community.md Sat May 31 03:21:26 2014
@@ -73,7 +73,7 @@ in 2009, and was open sourced in early 2
 Many of the ideas behind the system are presented in various
 <a href="{{site.url}}research.html">research papers</a>.
 The AMPLab continues to perform research on both improving Spark and on systems built on top, such as
-<a href="{{site.shark_url}}">Shark</a>, <a href="{{site.graphx_url}}">GraphX</a>, and
+<a href="{{site.shark_url}}">Shark</a>, <a href="{{site.url}}graphx/">GraphX</a>, and
 <a href="{{site.url}}streaming/">Spark Streaming</a>.
 </p>
 

Modified: spark/downloads.md
URL: http://svn.apache.org/viewvc/spark/downloads.md?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/downloads.md (original)
+++ spark/downloads.md Sat May 31 03:21:26 2014
@@ -16,13 +16,13 @@ Pre-built packages:
 <a href="http://www.apache.org/dyn/closer.cgi/spark/spark-1.0.0/spark-1.0.0-bin-hadoop1.tgz" onClick="trackOutboundLink(this, 'Release Download Links', 'apache_spark-1.0.0-bin-hadoop1.tgz'); return false;"> find an Apache mirror </a>
 or
 <a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-hadoop1.tgz" onClick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-1.0.0-bin-hadoop1.tgz'); return false;"> direct file download </a>
-* For CDH4: 
+* For CDH4:
 <a href="http://www.apache.org/dyn/closer.cgi/spark/spark-1.0.0/spark-1.0.0-bin-cdh4.tgz" onClick="trackOutboundLink(this, 'Release Download Links', 'apache_spark-1.0.0-bin-cdh4.tgz'); return false;"> find an Apache mirror </a>
-or 
+or
 <a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-cdh4.tgz" onClick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-1.0.0-bin-cdh4.tgz'); return false;"> direct file download </a>
-* For Hadoop 2 (HDP2, CDH5): 
+* For Hadoop 2 (HDP2, CDH5):
 <a href="http://www.apache.org/dyn/closer.cgi/spark/spark-1.0.0/spark-1.0.0-bin-hadoop2.tgz" onClick="trackOutboundLink(this, 'Release Download Links', 'apache_spark-1.0.0-bin-hadoop2.tgz'); return false;"> find an Apache mirror </a>
-or 
+or
 <a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-hadoop2.tgz" onClick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-1.0.0-bin-hadoop2.tgz'); return false;"> direct file download </a>
 
 Sources:
@@ -36,7 +36,7 @@ Verify your download: [signatures and ch
 The Spark download includes
 <a href="{{site.url}}streaming/">Spark Streaming</a>,
 <a href="{{site.url}}mllib/">MLlib</a> and
-<a href="http://amplab.github.io/graphx">GraphX</a> (alpha).
+<a href="{{site.url}}graphx/">GraphX</a> (alpha).
 -->
 
 ### Link with Spark
@@ -52,14 +52,14 @@ If you are interested in working with th
 Once you've downloaded Spark, you can find instructions for installing and building it on the <a href="{{site.url}}documentation.html">documentation page</a>.
 
 <h3 id="all-releases">All Releases</h3>
-* [Spark 1.0.0](http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0.tgz) (May 30, 2014) [(release notes)]({{site.url}}releases/spark-release-1.0.0.html) (prebuilt: [Hadoop1 [HDP1, CDH3]](http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-hadoop1.tgz), [CDH4](http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-cdh4.tgz), [Hadoop2 [HDP2, CDH5]](http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-hadoop2.tgz)) 
-* [Spark 0.9.1](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1.tgz) (Apr 9, 2014) [(release notes)]({{site.url}}releases/spark-release-0-9-1.html) (prebuilt: [Hadoop1 [HDP1, CDH3]](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-hadoop1.tgz), [CDH4](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-cdh4.tgz), [Hadoop2 [HDP2, CDH5]](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-hadoop2.tgz)) 
-* [Spark 0.9.0](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating.tgz) (Feb 2, 2014) [(release notes)]({{site.url}}releases/spark-release-0-9-0.html) (prebuilt: [Hadoop1 [HDP1, CDH3]](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-hadoop1.tgz), [CDH4](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-cdh4.tgz), [Hadoop2 [HDP2, CDH5]](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-hadoop2.tgz)) 
-* [Spark 0.8.1](http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating.tgz) (Dec 19, 2013) [(release notes)]({{site.url}}releases/spark-release-0-8-1.html) (prebuilt: [Hadoop1 [HDP1, CDH3]](http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating-bin-hadoop1.tgz), [CDH4](http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating-bin-cdh4.tgz), [Hadoop2 [HDP2, CDH5]](http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating-bin-hadoop2.tgz)) 
-* [Spark 0.8.0](http://d3kbcqa49mib13.cloudfront.net/spark-0.8.0-incubating.tgz) (Sept 25, 2013) [(release notes)]({{site.url}}releases/spark-release-0-8-0.html) (prebuilt: [Hadoop 1 / CDH3](http://spark-project.org/download/spark-0.8.0-incubating-bin-hadoop1.tgz), [CDH4](http://spark-project.org/download/spark-0.8.0-incubating-bin-cdh4.tgz)) 
+* [Spark 1.0.0](http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0.tgz) (May 30, 2014) [(release notes)]({{site.url}}releases/spark-release-1.0.0.html) (prebuilt: [Hadoop1 [HDP1, CDH3]](http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-hadoop1.tgz), [CDH4](http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-cdh4.tgz), [Hadoop2 [HDP2, CDH5]](http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-hadoop2.tgz))
+* [Spark 0.9.1](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1.tgz) (Apr 9, 2014) [(release notes)]({{site.url}}releases/spark-release-0-9-1.html) (prebuilt: [Hadoop1 [HDP1, CDH3]](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-hadoop1.tgz), [CDH4](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-cdh4.tgz), [Hadoop2 [HDP2, CDH5]](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-hadoop2.tgz))
+* [Spark 0.9.0](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating.tgz) (Feb 2, 2014) [(release notes)]({{site.url}}releases/spark-release-0-9-0.html) (prebuilt: [Hadoop1 [HDP1, CDH3]](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-hadoop1.tgz), [CDH4](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-cdh4.tgz), [Hadoop2 [HDP2, CDH5]](http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-hadoop2.tgz))
+* [Spark 0.8.1](http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating.tgz) (Dec 19, 2013) [(release notes)]({{site.url}}releases/spark-release-0-8-1.html) (prebuilt: [Hadoop1 [HDP1, CDH3]](http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating-bin-hadoop1.tgz), [CDH4](http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating-bin-cdh4.tgz), [Hadoop2 [HDP2, CDH5]](http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating-bin-hadoop2.tgz))
+* [Spark 0.8.0](http://d3kbcqa49mib13.cloudfront.net/spark-0.8.0-incubating.tgz) (Sept 25, 2013) [(release notes)]({{site.url}}releases/spark-release-0-8-0.html) (prebuilt: [Hadoop 1 / CDH3](http://spark-project.org/download/spark-0.8.0-incubating-bin-hadoop1.tgz), [CDH4](http://spark-project.org/download/spark-0.8.0-incubating-bin-cdh4.tgz))
 * [Spark 0.7.3](http://spark-project.org/download/spark-0.7.3-sources.tgz) (July 16, 2013) [(release notes)]({{site.url}}releases/spark-release-0-7-3.html) (prebuilt:
-[Hadoop1 / CDH3](http://spark-project.org/download/spark-0.7.3-prebuilt-hadoop1.tgz), [CDH4](http://spark-project.org/download/spark-0.7.3-prebuilt-cdh4.tgz)) 
-* [Spark 0.7.2](http://spark-project.org/download/spark-0.7.2-sources.tgz) (June 2, 2013) [(release notes)]({{site.url}}releases/spark-release-0-7-2.html) (prebuilt: 
+[Hadoop1 / CDH3](http://spark-project.org/download/spark-0.7.3-prebuilt-hadoop1.tgz), [CDH4](http://spark-project.org/download/spark-0.7.3-prebuilt-cdh4.tgz))
+* [Spark 0.7.2](http://spark-project.org/download/spark-0.7.2-sources.tgz) (June 2, 2013) [(release notes)]({{site.url}}releases/spark-release-0-7-2.html) (prebuilt:
 [Hadoop1 / CDH3](http://spark-project.org/download/spark-0.7.2-prebuilt-hadoop1.tgz), [CDH4](http://spark-project.org/download/spark-0.7.2-prebuilt-cdh4.tgz))
 * [Spark 0.7.0](http://spark-project.org/download/spark-0.7.0-sources.tgz) (February 27, 2013) [(release notes)]({{site.url}}releases/spark-release-0-7-0.html)
 * [Spark 0.6.2](http://spark-project.org/download/spark-0.6.2-sources.tgz) (February 7, 2013) [(release notes)]({{site.url}}releases/spark-release-0-6-2.html)
@@ -71,5 +71,3 @@ Once you've downloaded Spark, you can fi
 * [Spark 0.3 for Scala 2.9](https://github.com/mesos/spark/tarball/0.3-scala-2.9) (July 14, 2011) [(release notes)]({{site.url}}releases/spark-release-0-3.html)
 * [Spark 0.3 for Scala 2.8](https://github.com/mesos/spark/tarball/0.3-scala-2.8) (July 14, 2011) [(release notes)]({{site.url}}releases/spark-release-0-3.html)
 * [Spark 0.2](https://github.com/mesos/spark/tarball/alpha-0.2) (May 24, 2011)
-
-

Added: spark/graphx/index.md
URL: http://svn.apache.org/viewvc/spark/graphx/index.md?rev=1598804&view=auto
==============================================================================
--- spark/graphx/index.md (added)
+++ spark/graphx/index.md Sat May 31 03:21:26 2014
@@ -0,0 +1,117 @@
+---
+layout: global
+type: "page singular"
+title: GraphX
+subproject: GraphX
+---
+
+<div class="jumbotron">
+  <b>GraphX</b> is Apache Spark's API for graphs and graph-parallel computation.
+</div>
+
+<div class="row row-padded">
+  <div class="col-md-7 col-sm-7">
+    <h2>Flexibility</h2>
+    <p class="lead">
+      Seamlessly work with both graphs and collections.
+    </p>
+    <p>
+      GraphX unifies ETL, exploratory analysis, and iterative graph computation within a single system. You can <a href="{{site.url}}docs/latest/graphx-programming-guide.html#the-property-graph">view</a> the same data as both graphs and collections, <a href="{{site.url}}docs/latest/graphx-programming-guide.html#property-operators">transform</a> and <a href="{{site.url}}docs/latest/graphx-programming-guide.html#join-operators">join</a> graphs with RDDs efficiently, and write custom iterative graph algorithms using the <a href="{{site.url}}docs/latest/graphx-programming-guide.html#pregel-api">Pregel API</a>.
+    </p>
+  </div>
+  <div class="col-md-5 col-sm-5 col-padded-top col-center">
+
+    <div style="margin-top: 15px; text-align: left; display: inline-block;">
+      <div class="code">
+        graph = <span class="sparkop">Graph</span>(vertices, edges)<br/>
+        messages = spark.textFile(<span class="string">"hdfs://..."</span>)<br/>
+        graph2 = graph.<span class="sparkop">joinVertices</span>(messages) {<br/>
+        &nbsp;&nbsp;<span class="closure">(id, vertex, msg) => ...</span><br/>
+        }
+      </div>
+      <div class="caption">Using GraphX in Scala</div>
+    </div>
+  </div>
+</div>
+
+<div class="row row-padded">
+  <div class="col-md-7 col-sm-7">
+    <h2>Speed</h2>
+    <p class="lead">
+      Comparable performance to the fastest specialized graph processing systems.
+    </p>
+    <p>
+      GraphX competes on performance with the fastest graph systems while retaining Spark's flexibility, fault tolerance, and ease of use.
+    </p>
+  </div>
+  <div class="col-md-5 col-sm-5 col-padded-top col-center">
+    <div style="width: 100%; max-width: 272px; display: inline-block; text-align: center; padding:0;">
+      <img src="{{site.url}}images/graphx-perf-comparison.png" style="width: 60%; max-width: 250px;">
+      <div class="caption" style="min-width: 272px;">End-to-end PageRank performance (20 iterations, 3.7B edges)</div>
+    </div>
+  </div>
+</div>
+
+<div class="row row-padded">
+  <div class="col-md-7 col-sm-7">
+    <h2>Algorithms</h2>
+    <p class="lead">
+      Choose from a growing library of graph algorithms.
+    </p>
+    <p>In addition to a <a href="{{site.url}}docs/latest/graphx-programming-guide.html#graph-operators">highly flexible API</a>, GraphX comes with a variety of graph algorithms, many of which were contributed by our users.</p>
+  </div>
+  <div class="col-md-5 col-sm-5 col-padded-top">
+    <ul class="list-narrow">
+      <li>PageRank</li>
+      <li>Connected components</li>
+      <li>Label propagation</li>
+      <li>SVD++</li>
+      <li>Strongly connected components</li>
+      <li>Triangle count</li>
+    </ul>
+  </div>
+</div>
+
+
+<div class="row">
+  <div class="col-md-6 col-padded">
+    <h3>Community</h3>
+    <p>
+      GraphX is developed as part of the Apache Spark project. It thus gets
+      tested and updated with each Spark release.
+    </p>
+    <p>
+      If you have questions about the library, ask on the
+      <a href="{{site.url}}community.html#mailing-lists">Spark mailing lists</a>.
+    </p>
+    <p>
+      GraphX is in the alpha stage and welcomes contributions. If you'd like to submit a change to GraphX,
+      read <a href="https://cwiki.apache.org/confluence/display/SPARK/Contributing+to+Spark">how to
+      contribute to Spark</a> and send us a patch!
+    </p>
+  </div>
+
+  <div class="col-md-6 col-padded">
+    <h3>Getting Started</h3>
+    <p>
+      To get started with GraphX:
+    </p>
+    <ul class="list-narrow">
+      <li><a href="{{site.url}}downloads.html">Download Spark</a>. GraphX is included as a module.</li>
+      <li>Read the <a href="{{site.url}}docs/latest/graphx-programming-guide.html">GraphX guide</a>, which includes
+      usage examples.</li>
+      <li>Learn how to <a href="{{site.url}}docs/latest/#launching-on-a-cluster">deploy</a> Spark on a cluster
+        if you'd like to run in distributed mode. You can also run locally on a multicore machine
+        without any setup.
+      </li>
+    </ul>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-sm-12 col-center">
+    <a href="{{site.url}}downloads.html" class="btn btn-success btn-lg btn-multiline">
+      Download Spark<br/><span class="small">Includes GraphX</span>
+    </a>
+  </div>
+</div>

Added: spark/images/graphx-perf-comparison.png
URL: http://svn.apache.org/viewvc/spark/images/graphx-perf-comparison.png?rev=1598804&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spark/images/graphx-perf-comparison.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: spark/index.md
URL: http://svn.apache.org/viewvc/spark/index.md?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/index.md (original)
+++ spark/index.md Sat May 31 03:21:26 2014
@@ -84,7 +84,7 @@ navigation:
     <p>
       Spark powers a stack of high-level tools including
       <a href="{{site.shark_url}}">Shark</a> for SQL, <a href="{{site.url}}mllib/">MLlib</a> for machine learning,
-      <a href="{{site.graphx_url}}">GraphX</a>, and <a href="{{site.url}}streaming/">Spark Streaming</a>.
+      <a href="{{site.url}}graphx/">GraphX</a>, and <a href="{{site.url}}streaming/">Spark Streaming</a>.
       You can combine these frameworks seamlessly in the same application.
     </p>
   </div>
@@ -97,7 +97,7 @@ navigation:
             alt="Spark Streaming" title="Spark Streaming">
       <area shape="rect" coords="150,0,224,95" href="{{site.url}}mllib/"
             alt="MLlib (machine learning)" title="MLlib">
-      <area shape="rect" coords="225,0,300,95" href="{{site.graphx_url}}"
+      <area shape="rect" coords="225,0,300,95" href="{{site.url}}graphx/"
             alt="GraphX" title="GraphX">
     </map>
   </div>

Modified: spark/releases/_posts/2014-02-02-spark-release-0-9-0.md
URL: http://svn.apache.org/viewvc/spark/releases/_posts/2014-02-02-spark-release-0-9-0.md?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/releases/_posts/2014-02-02-spark-release-0-9-0.md (original)
+++ spark/releases/_posts/2014-02-02-spark-release-0-9-0.md Sat May 31 03:21:26 2014
@@ -11,12 +11,12 @@ meta:
   _wpas_done_all: '1'
 ---
 
-Spark 0.9.0 is a major release that adds significant new features. It updates Spark to Scala 2.10, simplifies high availability, and updates numerous components of the project. This release includes a first version of [GraphX](http://amplab.github.io/graphx/), a powerful new framework for graph processing that comes with a library of standard algorithms. In addition, [Spark Streaming]({{site.url}}streaming/) is now out of alpha, and includes significant optimizations and simplified high availability deployment.
+Spark 0.9.0 is a major release that adds significant new features. It updates Spark to Scala 2.10, simplifies high availability, and updates numerous components of the project. This release includes a first version of [GraphX]({{site.url}}graphx/), a powerful new framework for graph processing that comes with a library of standard algorithms. In addition, [Spark Streaming]({{site.url}}streaming/) is now out of alpha, and includes significant optimizations and simplified high availability deployment.
 
-You can download Spark 0.9.0 as either a 
+You can download Spark 0.9.0 as either a
 <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating.tgz" onClick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-0.9.0-incubating.tgz'); return false;">source package</a>
-(5 MB tgz) or a prebuilt package for 
-<a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-hadoop1.tgz" onClick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-0.9.0-incubating-bin-hadoop1.tgz'); return false;">Hadoop 1 / CDH3</a>, 
+(5 MB tgz) or a prebuilt package for
+<a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-hadoop1.tgz" onClick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-0.9.0-incubating-bin-hadoop1.tgz'); return false;">Hadoop 1 / CDH3</a>,
 <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-cdh4.tgz" onClick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-0.9.0-incubating-bin-cdh4.tgz'); return false;">CDH4</a>, or
 <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-hadoop2.tgz" onClick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-0.9.0-incubating-bin-hadoop2.tgz'); return false;">Hadoop 2 / CDH5 / HDP2</a>
 (160 MB tgz). Release signatures and checksums are available at the official [Apache download site](http://www.apache.org/dist/incubator/spark/spark-0.9.0-incubating/).
@@ -45,7 +45,7 @@ Spark Streaming is now out of alpha, and
 
 ### GraphX Alpha
 
-[GraphX](http://amplab.github.io/graphx/) is a new framework for graph processing that uses recent advances in graph-parallel computation. It lets you build a graph within a Spark program using the standard Spark operators, then process it with new graph operators that are optimized for distributed computation. It includes [basic transformations]({{site.url}}docs/0.9.0/api/graphx/index.html#org.apache.spark.graphx.Graph), a [Pregel API]({{site.url}}docs/0.9.0/api/graphx/index.html#org.apache.spark.graphx.Pregel$) for iterative computation, and a standard library of [graph loaders]({{site.url}}docs/0.9.0/api/graphx/index.html#org.apache.spark.graphx.util.GraphGenerators$) and [analytics algorithms]({{site.url}}docs/0.9.0/api/graphx/index.html#org.apache.spark.graphx.lib.package). By offering these features *within* the Spark engine, GraphX can significantly speed up processing pipelines compared to workflows that use different engines.
+[GraphX]({{site.url}}graphx/) is a new framework for graph processing that uses recent advances in graph-parallel computation. It lets you build a graph within a Spark program using the standard Spark operators, then process it with new graph operators that are optimized for distributed computation. It includes [basic transformations]({{site.url}}docs/0.9.0/api/graphx/index.html#org.apache.spark.graphx.Graph), a [Pregel API]({{site.url}}docs/0.9.0/api/graphx/index.html#org.apache.spark.graphx.Pregel$) for iterative computation, and a standard library of [graph loaders]({{site.url}}docs/0.9.0/api/graphx/index.html#org.apache.spark.graphx.util.GraphGenerators$) and [analytics algorithms]({{site.url}}docs/0.9.0/api/graphx/index.html#org.apache.spark.graphx.lib.package). By offering these features *within* the Spark engine, GraphX can significantly speed up processing pipelines compared to workflows that use different engines.
 
 GraphX features in this release include:
 

Modified: spark/site/community.html
URL: http://svn.apache.org/viewvc/spark/site/community.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/community.html (original)
+++ spark/site/community.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>
@@ -222,7 +222,7 @@ in 2009, and was open sourced in early 2
 Many of the ideas behind the system are presented in various
 <a href="/research.html">research papers</a>.
 The AMPLab continues to perform research on both improving Spark and on systems built on top, such as
-<a href="http://shark.cs.berkeley.edu">Shark</a>, <a href="http://amplab.github.io/graphx/">GraphX</a>, and
+<a href="http://shark.cs.berkeley.edu">Shark</a>, <a href="/graphx/">GraphX</a>, and
 <a href="/streaming/">Spark Streaming</a>.
 </p>
 

Modified: spark/site/documentation.html
URL: http://svn.apache.org/viewvc/spark/site/documentation.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/documentation.html (original)
+++ spark/site/documentation.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/downloads.html
URL: http://svn.apache.org/viewvc/spark/site/downloads.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/downloads.html (original)
+++ spark/site/downloads.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>
@@ -167,13 +167,13 @@
 <a href="http://www.apache.org/dyn/closer.cgi/spark/spark-1.0.0/spark-1.0.0-bin-hadoop1.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'apache_spark-1.0.0-bin-hadoop1.tgz'); return false;"> find an Apache mirror </a>
 or
 <a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-hadoop1.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-1.0.0-bin-hadoop1.tgz'); return false;"> direct file download </a></li>
-  <li>For CDH4: 
+  <li>For CDH4:
 <a href="http://www.apache.org/dyn/closer.cgi/spark/spark-1.0.0/spark-1.0.0-bin-cdh4.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'apache_spark-1.0.0-bin-cdh4.tgz'); return false;"> find an Apache mirror </a>
-or 
+or
 <a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-cdh4.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-1.0.0-bin-cdh4.tgz'); return false;"> direct file download </a></li>
-  <li>For Hadoop 2 (HDP2, CDH5): 
+  <li>For Hadoop 2 (HDP2, CDH5):
 <a href="http://www.apache.org/dyn/closer.cgi/spark/spark-1.0.0/spark-1.0.0-bin-hadoop2.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'apache_spark-1.0.0-bin-hadoop2.tgz'); return false;"> find an Apache mirror </a>
-or 
+or
 <a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-hadoop2.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-1.0.0-bin-hadoop2.tgz'); return false;"> direct file download </a></li>
 </ul>
 
@@ -188,7 +188,7 @@ or
 The Spark download includes
 <a href="/streaming/">Spark Streaming</a>,
 <a href="/mllib/">MLlib</a> and
-<a href="http://amplab.github.io/graphx">GraphX</a> (alpha).
+<a href="/graphx/">GraphX</a> (alpha).
 -->
 
 <h3 id="link-with-spark">Link with Spark</h3>
@@ -206,14 +206,14 @@ version: 1.0.0
 
 <h3 id="all-releases">All Releases</h3>
 <ul>
-  <li><a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0.tgz">Spark 1.0.0</a> (May 30, 2014) <a href="/releases/spark-release-1.0.0.html">(release notes)</a> (prebuilt: <a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-hadoop1.tgz">Hadoop1 [HDP1, CDH3]</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-cdh4.tgz">CDH4</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-hadoop2.tgz">Hadoop2 [HDP2, CDH5]</a>) </li>
-  <li><a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1.tgz">Spark 0.9.1</a> (Apr 9, 2014) <a href="/releases/spark-release-0-9-1.html">(release notes)</a> (prebuilt: <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-hadoop1.tgz">Hadoop1 [HDP1, CDH3]</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-cdh4.tgz">CDH4</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-hadoop2.tgz">Hadoop2 [HDP2, CDH5]</a>) </li>
-  <li><a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating.tgz">Spark 0.9.0</a> (Feb 2, 2014) <a href="/releases/spark-release-0-9-0.html">(release notes)</a> (prebuilt: <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-hadoop1.tgz">Hadoop1 [HDP1, CDH3]</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-cdh4.tgz">CDH4</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-hadoop2.tgz">Hadoop2 [HDP2, CDH5]</a>) </li>
-  <li><a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating.tgz">Spark 0.8.1</a> (Dec 19, 2013) <a href="/releases/spark-release-0-8-1.html">(release notes)</a> (prebuilt: <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating-bin-hadoop1.tgz">Hadoop1 [HDP1, CDH3]</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating-bin-cdh4.tgz">CDH4</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating-bin-hadoop2.tgz">Hadoop2 [HDP2, CDH5]</a>) </li>
-  <li><a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.8.0-incubating.tgz">Spark 0.8.0</a> (Sept 25, 2013) <a href="/releases/spark-release-0-8-0.html">(release notes)</a> (prebuilt: <a href="http://spark-project.org/download/spark-0.8.0-incubating-bin-hadoop1.tgz">Hadoop 1 / CDH3</a>, <a href="http://spark-project.org/download/spark-0.8.0-incubating-bin-cdh4.tgz">CDH4</a>) </li>
+  <li><a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0.tgz">Spark 1.0.0</a> (May 30, 2014) <a href="/releases/spark-release-1.0.0.html">(release notes)</a> (prebuilt: <a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-hadoop1.tgz">Hadoop1 [HDP1, CDH3]</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-cdh4.tgz">CDH4</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-1.0.0-bin-hadoop2.tgz">Hadoop2 [HDP2, CDH5]</a>)</li>
+  <li><a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1.tgz">Spark 0.9.1</a> (Apr 9, 2014) <a href="/releases/spark-release-0-9-1.html">(release notes)</a> (prebuilt: <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-hadoop1.tgz">Hadoop1 [HDP1, CDH3]</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-cdh4.tgz">CDH4</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-hadoop2.tgz">Hadoop2 [HDP2, CDH5]</a>)</li>
+  <li><a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating.tgz">Spark 0.9.0</a> (Feb 2, 2014) <a href="/releases/spark-release-0-9-0.html">(release notes)</a> (prebuilt: <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-hadoop1.tgz">Hadoop1 [HDP1, CDH3]</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-cdh4.tgz">CDH4</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.0-incubating-bin-hadoop2.tgz">Hadoop2 [HDP2, CDH5]</a>)</li>
+  <li><a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating.tgz">Spark 0.8.1</a> (Dec 19, 2013) <a href="/releases/spark-release-0-8-1.html">(release notes)</a> (prebuilt: <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating-bin-hadoop1.tgz">Hadoop1 [HDP1, CDH3]</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating-bin-cdh4.tgz">CDH4</a>, <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.8.1-incubating-bin-hadoop2.tgz">Hadoop2 [HDP2, CDH5]</a>)</li>
+  <li><a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.8.0-incubating.tgz">Spark 0.8.0</a> (Sept 25, 2013) <a href="/releases/spark-release-0-8-0.html">(release notes)</a> (prebuilt: <a href="http://spark-project.org/download/spark-0.8.0-incubating-bin-hadoop1.tgz">Hadoop 1 / CDH3</a>, <a href="http://spark-project.org/download/spark-0.8.0-incubating-bin-cdh4.tgz">CDH4</a>)</li>
   <li><a href="http://spark-project.org/download/spark-0.7.3-sources.tgz">Spark 0.7.3</a> (July 16, 2013) <a href="/releases/spark-release-0-7-3.html">(release notes)</a> (prebuilt:
-<a href="http://spark-project.org/download/spark-0.7.3-prebuilt-hadoop1.tgz">Hadoop1 / CDH3</a>, <a href="http://spark-project.org/download/spark-0.7.3-prebuilt-cdh4.tgz">CDH4</a>) </li>
-  <li><a href="http://spark-project.org/download/spark-0.7.2-sources.tgz">Spark 0.7.2</a> (June 2, 2013) <a href="/releases/spark-release-0-7-2.html">(release notes)</a> (prebuilt: 
+<a href="http://spark-project.org/download/spark-0.7.3-prebuilt-hadoop1.tgz">Hadoop1 / CDH3</a>, <a href="http://spark-project.org/download/spark-0.7.3-prebuilt-cdh4.tgz">CDH4</a>)</li>
+  <li><a href="http://spark-project.org/download/spark-0.7.2-sources.tgz">Spark 0.7.2</a> (June 2, 2013) <a href="/releases/spark-release-0-7-2.html">(release notes)</a> (prebuilt:
 <a href="http://spark-project.org/download/spark-0.7.2-prebuilt-hadoop1.tgz">Hadoop1 / CDH3</a>, <a href="http://spark-project.org/download/spark-0.7.2-prebuilt-cdh4.tgz">CDH4</a>)</li>
   <li><a href="http://spark-project.org/download/spark-0.7.0-sources.tgz">Spark 0.7.0</a> (February 27, 2013) <a href="/releases/spark-release-0-7-0.html">(release notes)</a></li>
   <li><a href="http://spark-project.org/download/spark-0.6.2-sources.tgz">Spark 0.6.2</a> (February 7, 2013) <a href="/releases/spark-release-0-6-2.html">(release notes)</a></li>
@@ -227,7 +227,6 @@ version: 1.0.0
   <li><a href="https://github.com/mesos/spark/tarball/alpha-0.2">Spark 0.2</a> (May 24, 2011)</li>
 </ul>
 
-
   </div>
 </div>
 

Modified: spark/site/examples.html
URL: http://svn.apache.org/viewvc/spark/site/examples.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/examples.html (original)
+++ spark/site/examples.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/faq.html
URL: http://svn.apache.org/viewvc/spark/site/faq.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/faq.html (original)
+++ spark/site/faq.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Added: spark/site/graphx/index.html
URL: http://svn.apache.org/viewvc/spark/site/graphx/index.html?rev=1598804&view=auto
==============================================================================
--- spark/site/graphx/index.html (added)
+++ spark/site/graphx/index.html Sat May 31 03:21:26 2014
@@ -0,0 +1,293 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <title>
+     GraphX | Apache Spark
+    
+  </title>
+
+  
+
+  <!-- Bootstrap core CSS -->
+  <link href="/css/cerulean.min.css" rel="stylesheet">
+  <link href="/css/custom.css" rel="stylesheet">
+
+  <script type="text/javascript">
+  <!-- Google Analytics initialization -->
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-32518208-2']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+  <!-- Adds slight delay to links to allow async reporting -->
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
+    } catch(err){}
+
+    setTimeout(function() {
+      document.location.href = link.href;
+    }, 100);
+  }
+  </script>
+
+  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+  <!--[if lt IE 9]>
+  <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+  <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+  <![endif]-->
+</head>
+
+<body>
+
+<div class="container" style="max-width: 1200px;">
+
+<div class="masthead">
+  
+    <p class="lead">
+      <a href="/">
+      <img src="/images/spark-logo.png"
+      style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;"></a>
+      <a href="#"><span class="subproject">
+        GraphX
+      </span></a>
+    </p>
+  
+</div>
+
+<nav class="navbar navbar-default" role="navigation">
+  <!-- Brand and toggle get grouped for better mobile display -->
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse"
+            data-target="#navbar-collapse-1">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+  </div>
+
+  <!-- Collect the nav links, forms, and other content for toggling -->
+  <div class="collapse navbar-collapse" id="navbar-collapse-1">
+    <ul class="nav navbar-nav">
+      <li><a href="/downloads.html">Download</a></li>
+      <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+          Related Projects <b class="caret"></b>
+        </a>
+        <ul class="dropdown-menu">
+          
+          <li><a href="/">Apache Spark</a></li>
+          
+          <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
+          <li><a href="/streaming/">Spark Streaming</a></li>
+          <li><a href="/mllib/">MLlib (machine learning)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
+        </ul>
+      </li>
+      <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+          Documentation <b class="caret"></b>
+        </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="/examples.html">Examples</a></li>
+        </ul>
+      </li>
+      <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+          Community <b class="caret"></b>
+        </a>
+        <ul class="dropdown-menu">
+          <li><a href="/community.html">Mailing Lists</a></li>
+          <li><a href="/community.html#events">Events and Meetups</a></li>
+          <li><a href="/community.html#history">Project History</a></li>
+          <li><a href="https://cwiki.apache.org/confluence/display/SPARK/Powered+By+Spark">Powered By</a></li>
+        </ul>
+      </li>
+      <li><a href="/faq.html">FAQ</a></li>
+    </ul>
+  </div>
+  <!-- /.navbar-collapse -->
+</nav>
+
+
+<div class="row">
+  <div class="col-md-3 col-md-push-9">
+    <div class="news" style="margin-bottom: 20px;">
+      <h5>Latest News</h5>
+      <ul class="list-unstyled">
+        
+          <li><a href="/news/spark-1-0-0-released.html">Spark 1.0.0 released</a>
+          <span class="small">(May 30, 2014)</span></li>
+        
+          <li><a href="/news/spark-summit-agenda-posted.html">Spark Summit agenda posted</a>
+          <span class="small">(May 11, 2014)</span></li>
+        
+          <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>
+    <div class="hidden-xs hidden-sm">
+      <a href="/downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;">
+        Download Spark
+      </a>
+      <p style="font-size: 16px; font-weight: 500; color: #555;">
+        Related Projects:
+      </p>
+      <ul class="list-narrow">
+        
+        <li><a href="/">Apache Spark</a></li>
+        
+        <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
+        <li><a href="/streaming/">Spark Streaming</a></li>
+        <li><a href="/mllib/">MLlib (machine learning)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="col-md-9 col-md-pull-3">
+    <div class="jumbotron">
+  <b>GraphX</b> is Apache Spark's API for graphs and graph-parallel computation.
+</div>
+
+<div class="row row-padded">
+  <div class="col-md-7 col-sm-7">
+    <h2>Flexibility</h2>
+    <p class="lead">
+      Seamlessly work with both graphs and collections.
+    </p>
+    <p>
+      GraphX unifies ETL, exploratory analysis, and iterative graph computation within a single system. You can <a href="/docs/latest/graphx-programming-guide.html#the-property-graph">view</a> the same data as both graphs and collections, <a href="/docs/latest/graphx-programming-guide.html#property-operators">transform</a> and <a href="/docs/latest/graphx-programming-guide.html#join-operators">join</a> graphs with RDDs efficiently, and write custom iterative graph algorithms using the <a href="/docs/latest/graphx-programming-guide.html#pregel-api">Pregel API</a>.
+    </p>
+  </div>
+  <div class="col-md-5 col-sm-5 col-padded-top col-center">
+
+    <div style="margin-top: 15px; text-align: left; display: inline-block;">
+      <div class="code">
+        graph = <span class="sparkop">Graph</span>(vertices, edges)<br />
+        messages = spark.textFile(<span class="string">"hdfs://..."</span>)<br />
+        graph2 = graph.<span class="sparkop">joinVertices</span>(messages) {<br />
+        &nbsp;&nbsp;<span class="closure">(id, vertex, msg) =&gt; ...</span><br />
+        }
+      </div>
+      <div class="caption">Using GraphX in Scala</div>
+    </div>
+  </div>
+</div>
+
+<div class="row row-padded">
+  <div class="col-md-7 col-sm-7">
+    <h2>Speed</h2>
+    <p class="lead">
+      Comparable performance to the fastest specialized graph processing systems.
+    </p>
+    <p>
+      GraphX competes on performance with the fastest graph systems while retaining Spark's flexibility, fault tolerance, and ease of use.
+    </p>
+  </div>
+  <div class="col-md-5 col-sm-5 col-padded-top col-center">
+    <div style="width: 100%; max-width: 272px; display: inline-block; text-align: center; padding:0;">
+      <img src="/images/graphx-perf-comparison.png" style="width: 60%; max-width: 250px;" />
+      <div class="caption" style="min-width: 272px;">End-to-end PageRank performance (20 iterations, 3.7B edges)</div>
+    </div>
+  </div>
+</div>
+
+<div class="row row-padded">
+  <div class="col-md-7 col-sm-7">
+    <h2>Algorithms</h2>
+    <p class="lead">
+      Choose from a growing library of graph algorithms.
+    </p>
+    <p>In addition to a <a href="/docs/latest/graphx-programming-guide.html#graph-operators">highly flexible API</a>, GraphX comes with a variety of graph algorithms, many of which were contributed by our users.</p>
+  </div>
+  <div class="col-md-5 col-sm-5 col-padded-top">
+    <ul class="list-narrow">
+      <li>PageRank</li>
+      <li>Connected components</li>
+      <li>Label propagation</li>
+      <li>SVD++</li>
+      <li>Strongly connected components</li>
+      <li>Triangle count</li>
+    </ul>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-md-6 col-padded">
+    <h3>Community</h3>
+    <p>
+      GraphX is developed as part of the Apache Spark project. It thus gets
+      tested and updated with each Spark release.
+    </p>
+    <p>
+      If you have questions about the library, ask on the
+      <a href="/community.html#mailing-lists">Spark mailing lists</a>.
+    </p>
+    <p>
+      GraphX is in the alpha stage and welcomes contributions. If you'd like to submit a change to GraphX,
+      read <a href="https://cwiki.apache.org/confluence/display/SPARK/Contributing+to+Spark">how to
+      contribute to Spark</a> and send us a patch!
+    </p>
+  </div>
+
+  <div class="col-md-6 col-padded">
+    <h3>Getting Started</h3>
+    <p>
+      To get started with GraphX:
+    </p>
+    <ul class="list-narrow">
+      <li><a href="/downloads.html">Download Spark</a>. GraphX is included as a module.</li>
+      <li>Read the <a href="/docs/latest/graphx-programming-guide.html">GraphX guide</a>, which includes
+      usage examples.</li>
+      <li>Learn how to <a href="/docs/latest/#launching-on-a-cluster">deploy</a> Spark on a cluster
+        if you'd like to run in distributed mode. You can also run locally on a multicore machine
+        without any setup.
+      </li>
+    </ul>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-sm-12 col-center">
+    <a href="/downloads.html" class="btn btn-success btn-lg btn-multiline">
+      Download Spark<br /><span class="small">Includes GraphX</span>
+    </a>
+  </div>
+</div>
+
+  </div>
+</div>
+
+
+
+<footer class="small">
+  <hr>
+  Apache Spark, Spark, Apache, and the Spark logo are trademarks of
+  <a href="http://www.apache.org">The Apache Software Foundation</a>.
+</footer>
+
+</div>
+
+<script src="https://code.jquery.com/jquery.js"></script>
+<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
+<script src="/js/lang-tabs.js"></script>
+
+</body>
+</html>

Added: spark/site/images/graphx-perf-comparison.png
URL: http://svn.apache.org/viewvc/spark/site/images/graphx-perf-comparison.png?rev=1598804&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spark/site/images/graphx-perf-comparison.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: spark/site/index.html
URL: http://svn.apache.org/viewvc/spark/site/index.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/index.html (original)
+++ spark/site/index.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>
@@ -231,7 +231,7 @@
     <p>
       Spark powers a stack of high-level tools including
       <a href="http://shark.cs.berkeley.edu">Shark</a> for SQL, <a href="/mllib/">MLlib</a> for machine learning,
-      <a href="http://amplab.github.io/graphx/">GraphX</a>, and <a href="/streaming/">Spark Streaming</a>.
+      <a href="/graphx/">GraphX</a>, and <a href="/streaming/">Spark Streaming</a>.
       You can combine these frameworks seamlessly in the same application.
     </p>
   </div>
@@ -241,7 +241,7 @@
       <area shape="rect" coords="0,0,74,95" href="http://shark.cs.berkeley.edu" alt="Shark (SQL)" title="Shark" />
       <area shape="rect" coords="74,0,150,95" href="/streaming/" alt="Spark Streaming" title="Spark Streaming" />
       <area shape="rect" coords="150,0,224,95" href="/mllib/" alt="MLlib (machine learning)" title="MLlib" />
-      <area shape="rect" coords="225,0,300,95" href="http://amplab.github.io/graphx/" alt="GraphX" title="GraphX" />
+      <area shape="rect" coords="225,0,300,95" href="/graphx/" alt="GraphX" title="GraphX" />
     </map>
   </div>
 </div>

Modified: spark/site/mailing-lists.html
URL: http://svn.apache.org/viewvc/spark/site/mailing-lists.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/mailing-lists.html (original)
+++ spark/site/mailing-lists.html Sat May 31 03:21:26 2014
@@ -31,11 +31,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -90,7 +90,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -154,7 +154,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/mllib/index.html
URL: http://svn.apache.org/viewvc/spark/site/mllib/index.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/mllib/index.html (original)
+++ spark/site/mllib/index.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -90,7 +90,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -156,7 +156,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/amp-camp-2013-registration-ope.html
URL: http://svn.apache.org/viewvc/spark/site/news/amp-camp-2013-registration-ope.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/amp-camp-2013-registration-ope.html (original)
+++ spark/site/news/amp-camp-2013-registration-ope.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/announcing-the-first-spark-summit.html
URL: http://svn.apache.org/viewvc/spark/site/news/announcing-the-first-spark-summit.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/announcing-the-first-spark-summit.html (original)
+++ spark/site/news/announcing-the-first-spark-summit.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/fourth-spark-screencast-published.html
URL: http://svn.apache.org/viewvc/spark/site/news/fourth-spark-screencast-published.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/fourth-spark-screencast-published.html (original)
+++ spark/site/news/fourth-spark-screencast-published.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/index.html
URL: http://svn.apache.org/viewvc/spark/site/news/index.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/index.html (original)
+++ spark/site/news/index.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/nsdi-paper.html
URL: http://svn.apache.org/viewvc/spark/site/news/nsdi-paper.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/nsdi-paper.html (original)
+++ spark/site/news/nsdi-paper.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/run-spark-and-shark-on-amazon-emr.html
URL: http://svn.apache.org/viewvc/spark/site/news/run-spark-and-shark-on-amazon-emr.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/run-spark-and-shark-on-amazon-emr.html (original)
+++ spark/site/news/run-spark-and-shark-on-amazon-emr.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/spark-0-6-1-and-0-5-2-released.html
URL: http://svn.apache.org/viewvc/spark/site/news/spark-0-6-1-and-0-5-2-released.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/spark-0-6-1-and-0-5-2-released.html (original)
+++ spark/site/news/spark-0-6-1-and-0-5-2-released.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/spark-0-6-2-released.html
URL: http://svn.apache.org/viewvc/spark/site/news/spark-0-6-2-released.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/spark-0-6-2-released.html (original)
+++ spark/site/news/spark-0-6-2-released.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/spark-0-7-0-released.html
URL: http://svn.apache.org/viewvc/spark/site/news/spark-0-7-0-released.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/spark-0-7-0-released.html (original)
+++ spark/site/news/spark-0-7-0-released.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/spark-0-7-2-released.html
URL: http://svn.apache.org/viewvc/spark/site/news/spark-0-7-2-released.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/spark-0-7-2-released.html (original)
+++ spark/site/news/spark-0-7-2-released.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/spark-0-7-3-released.html
URL: http://svn.apache.org/viewvc/spark/site/news/spark-0-7-3-released.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/spark-0-7-3-released.html (original)
+++ spark/site/news/spark-0-7-3-released.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/spark-0-8-0-released.html
URL: http://svn.apache.org/viewvc/spark/site/news/spark-0-8-0-released.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/spark-0-8-0-released.html (original)
+++ spark/site/news/spark-0-8-0-released.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/spark-0-8-1-released.html
URL: http://svn.apache.org/viewvc/spark/site/news/spark-0-8-1-released.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/spark-0-8-1-released.html (original)
+++ spark/site/news/spark-0-8-1-released.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/spark-0-9-0-released.html
URL: http://svn.apache.org/viewvc/spark/site/news/spark-0-9-0-released.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/spark-0-9-0-released.html (original)
+++ spark/site/news/spark-0-9-0-released.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/spark-0-9-1-released.html
URL: http://svn.apache.org/viewvc/spark/site/news/spark-0-9-1-released.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/spark-0-9-1-released.html (original)
+++ spark/site/news/spark-0-9-1-released.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/spark-1-0-0-released.html
URL: http://svn.apache.org/viewvc/spark/site/news/spark-1-0-0-released.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/spark-1-0-0-released.html (original)
+++ spark/site/news/spark-1-0-0-released.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>

Modified: spark/site/news/spark-accepted-into-apache-incubator.html
URL: http://svn.apache.org/viewvc/spark/site/news/spark-accepted-into-apache-incubator.html?rev=1598804&r1=1598803&r2=1598804&view=diff
==============================================================================
--- spark/site/news/spark-accepted-into-apache-incubator.html (original)
+++ spark/site/news/spark-accepted-into-apache-incubator.html Sat May 31 03:21:26 2014
@@ -28,11 +28,11 @@
   })();
 
   <!-- Adds slight delay to links to allow async reporting -->
-  function trackOutboundLink(link, category, action) {  
-    try { 
-      _gaq.push(['_trackEvent', category , action]); 
+  function trackOutboundLink(link, category, action) {
+    try {
+      _gaq.push(['_trackEvent', category , action]);
     } catch(err){}
- 
+
     setTimeout(function() {
       document.location.href = link.href;
     }, 100);
@@ -87,7 +87,7 @@
           <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
           <li><a href="/streaming/">Spark Streaming</a></li>
           <li><a href="/mllib/">MLlib (machine learning)</a></li>
-          <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+          <li><a href="/graphx/">GraphX (graph)</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -151,7 +151,7 @@
         <li><a href="http://shark.cs.berkeley.edu">Shark (SQL)</a></li>
         <li><a href="/streaming/">Spark Streaming</a></li>
         <li><a href="/mllib/">MLlib (machine learning)</a></li>
-        <li><a href="http://amplab.github.io/graphx/">GraphX (graph)</a></li>
+        <li><a href="/graphx/">GraphX (graph)</a></li>
       </ul>
     </div>
   </div>