aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Owen <sowen@cloudera.com>2014-11-09 17:40:48 -0800
committerPatrick Wendell <pwendell@gmail.com>2014-11-09 17:40:48 -0800
commit8c99a47a4f0369ff3c1ecaeb860fa61ee789e987 (patch)
tree8e7155880a6f9e6e12be0c4ee8f2ca39febb5ce4
parent7b41b17f3296eea3282efbdceb6b28baf128287d (diff)
downloadspark-8c99a47a4f0369ff3c1ecaeb860fa61ee789e987.tar.gz
spark-8c99a47a4f0369ff3c1ecaeb860fa61ee789e987.tar.bz2
spark-8c99a47a4f0369ff3c1ecaeb860fa61ee789e987.zip
SPARK-971 [DOCS] Link to Confluence wiki from project website / documentation
This is a trivial change to add links to the wiki from `README.md` and the main docs page. It is already linked to from spark.apache.org. Author: Sean Owen <sowen@cloudera.com> Closes #3169 from srowen/SPARK-971 and squashes the following commits: dcb84d0 [Sean Owen] Add link to wiki from README, docs home page
-rw-r--r--README.md3
-rw-r--r--docs/index.md1
2 files changed, 3 insertions, 1 deletions
diff --git a/README.md b/README.md
index 9916ac7b1a..8d57d50da9 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,8 @@ and Spark Streaming for stream processing.
## Online Documentation
You can find the latest Spark documentation, including a programming
-guide, on the [project web page](http://spark.apache.org/documentation.html).
+guide, on the [project web page](http://spark.apache.org/documentation.html)
+and [project wiki](https://cwiki.apache.org/confluence/display/SPARK).
This README file only contains basic setup instructions.
## Building Spark
diff --git a/docs/index.md b/docs/index.md
index edd622ec90..171d6ddad6 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -112,6 +112,7 @@ options for deployment:
**External Resources:**
* [Spark Homepage](http://spark.apache.org)
+* [Spark Wiki](https://cwiki.apache.org/confluence/display/SPARK)
* [Mailing Lists](http://spark.apache.org/mailing-lists.html): ask questions about Spark here
* [AMP Camps](http://ampcamp.berkeley.edu/): a series of training camps at UC Berkeley that featured talks and
exercises about Spark, Spark Streaming, Mesos, and more. [Videos](http://ampcamp.berkeley.edu/3/),