summaryrefslogtreecommitdiff
path: root/index.md
diff options
context:
space:
mode:
authorMatei Alexandru Zaharia <matei@apache.org>2015-05-03 20:48:43 +0000
committerMatei Alexandru Zaharia <matei@apache.org>2015-05-03 20:48:43 +0000
commit89f62639b1da7274c363631436ab00a89e1888a0 (patch)
treee89cc201680d759e9c1f9564624f8f54eba2c84d /index.md
parent60d4a0f5a0f2ec6f038b11ebe7341ba763be84af (diff)
downloadspark-website-89f62639b1da7274c363631436ab00a89e1888a0.tar.gz
spark-website-89f62639b1da7274c363631436ab00a89e1888a0.tar.bz2
spark-website-89f62639b1da7274c363631436ab00a89e1888a0.zip
Some updates to FAQ and homepage
Diffstat (limited to 'index.md')
-rw-r--r--index.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/index.md b/index.md
index 7566acbee..754bbf253 100644
--- a/index.md
+++ b/index.md
@@ -109,13 +109,13 @@ navigation:
<h2>Runs Everywhere</h2>
<p class="lead">
- Spark runs on Hadoop, Mesos, standalone, or in the cloud. It can access diverse data sources including HDFS, Cassandra, HBase, S3.
+ Spark runs on Hadoop, Mesos, standalone, or in the cloud. It can access diverse data sources including HDFS, Cassandra, HBase, and S3.
</p>
<p>
- You can run Spark readily using its <a href="{{site.url}}docs/latest/spark-standalone.html">standalone cluster mode</a>, on <a href="{{site.url}}docs/latest/ec2-scripts.html">EC2</a>, or run it on Hadoop YARN or <a href="http://mesos.apache.org">Apache Mesos</a>.
- It can read from <a href="http://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HdfsUserGuide.html">HDFS</a>, <a href="http://hbase.apache.org">HBase</a>, <a href="http://cassandra.apache.org">Cassandra</a>,
- and any Hadoop data source.
+ You can run Spark using its <a href="{{site.url}}docs/latest/spark-standalone.html">standalone cluster mode</a>, on <a href="{{site.url}}docs/latest/ec2-scripts.html">EC2</a>, on Hadoop YARN, or on <a href="http://mesos.apache.org">Apache Mesos</a>.
+ Access data in <a href="http://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HdfsUserGuide.html">HDFS</a>, <a href="http://cassandra.apache.org">Cassandra</a>, <a href="http://hbase.apache.org">HBase</a>,
+ <a href="http://hive.apache.org">Hive</a>, <a href="http://tachyon-project.org">Tachyon</a>, and any Hadoop data source.
</p>
</div>
<div class="col-md-5 col-sm-5 col-padded-top col-center">