From 27fdaf4d504b00063936ca646dd7a583d7f6a326 Mon Sep 17 00:00:00 2001
From: Matei Alexandru Zaharia <matei@apache.org>
Date: Sat, 3 May 2014 22:00:28 +0000
Subject: simplify downloads a bit

---
 site/downloads.html | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'site/downloads.html')

diff --git a/site/downloads.html b/site/downloads.html
index 06b95f7d1..b5398bcf9 100644
--- a/site/downloads.html
+++ b/site/downloads.html
@@ -160,37 +160,36 @@
     <h2 id="download-spark">Download Spark</h2>
 <p>The latest release is Spark 0.9.1, released April 9, 2014 <a href="/releases/spark-release-0-9-1.html">(release notes)</a> <a href="https://git-wip-us.apache.org/repos/asf?p=spark.git;a=commit;h=4c43182b6d1b0b7717423f386c0214fe93073208">(git tag)</a></p>
 
+<p>Pre-built packages:</p>
+
 <ul>
-  <li>Download sources: 
-<a href="http://www.apache.org/dyn/closer.cgi/incubator/spark/spark-0.9.1/spark-0.9.1.tgz" onclick="trackOutboundLink(this, 'Release Downlaod Links', 'apache_spark-0.9.1.tgz'); return false;"> find an Apache mirror </a>
-or
-<a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-0.9.1.tgz'); return false;"> direct file download </a></li>
-  <li>Download binaries for Hadoop 1 (HDP1, CDH3):
+  <li>For Hadoop 1 (HDP1, CDH3):
 <a href="http://www.apache.org/dyn/closer.cgi/incubator/spark/spark-0.9.1/spark-0.9.1-bin-hadoop1.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'apache_spark-0.9.1-bin-hadoop1.tgz'); return false;"> find an Apache mirror </a>
 or
 <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-hadoop1.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-0.9.1-bin-hadoop1.tgz'); return false;"> direct file download </a></li>
-  <li>Download binaries for CDH4: 
+  <li>For CDH4: 
 <a href="http://www.apache.org/dyn/closer.cgi/incubator/spark/spark-0.9.1/spark-0.9.1-bin-cdh4.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'apache_spark-0.9.1-bin-cdh4.tgz'); return false;"> find an Apache mirror </a>
 or 
 <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-cdh4.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-0.9.1-bin-cdh4.tgz'); return false;"> direct file download </a></li>
-  <li>Download binaries for Hadoop 2 (HDP2, CDH5): 
+  <li>For Hadoop 2 (HDP2, CDH5): 
 <a href="http://www.apache.org/dyn/closer.cgi/incubator/spark/spark-0.9.1/spark-0.9.1-bin-hadoop2.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'apache_spark-0.9.1-bin-hadoop2.tgz'); return false;"> find an Apache mirror </a>
 or 
 <a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1-bin-hadoop2.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-0.9.1-bin-hadoop2.tgz'); return false;"> direct file download </a></li>
-  <li>Verify your download: <a href="http://www.apache.org/dist/incubator/spark/spark-0.9.1/">signatures and checksums</a></li>
 </ul>
 
+<p>Sources:
+<a href="http://www.apache.org/dyn/closer.cgi/incubator/spark/spark-0.9.1/spark-0.9.1.tgz" onclick="trackOutboundLink(this, 'Release Downlaod Links', 'apache_spark-0.9.1.tgz'); return false;"> find an Apache mirror </a>
+or
+<a href="http://d3kbcqa49mib13.cloudfront.net/spark-0.9.1.tgz" onclick="trackOutboundLink(this, 'Release Download Links', 'cloudfront_spark-0.9.1.tgz'); return false;"> direct file download </a></p>
+
+<p>Verify your download: <a href="http://www.apache.org/dist/incubator/spark/spark-0.9.1/">signatures and checksums</a></p>
+
 <!--
 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>.
--->
-
-<p>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).</p>
+<a href="http://amplab.github.io/graphx">GraphX</a> (alpha).
+-->
 
 <h3 id="link-with-spark">Link with Spark</h3>
 <p>Spark artifacts are <a href="http://search.maven.org/#browse%7C1686516968">hosted in Maven Central</a>. You can add a Maven dependency with the following coordinates:</p>
@@ -205,7 +204,7 @@ version: 0.9.1
 
 <p>Once you’ve downloaded Spark, you can find instructions for installing and building it on the <a href="/documentation.html">documentation page</a>.</p>
 
-<h3 id="all-releases">All Releases</h3>
+<h3 id="all-releases">Older Releases</h3>
 <ul>
   <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>
-- 
cgit v1.2.3