Repository: spark Updated Branches: refs/heads/branch-1.2 21b9ac062 -> 6824af0c3
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 <[email protected]> Closes #3169 from srowen/SPARK-971 and squashes the following commits: dcb84d0 [Sean Owen] Add link to wiki from README, docs home page (cherry picked from commit 8c99a47a4f0369ff3c1ecaeb860fa61ee789e987) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6824af0c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6824af0c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6824af0c Branch: refs/heads/branch-1.2 Commit: 6824af0c3a29aa2d11606495c4a95915233ba96e Parents: 21b9ac0 Author: Sean Owen <[email protected]> Authored: Sun Nov 9 17:40:48 2014 -0800 Committer: Patrick Wendell <[email protected]> Committed: Sun Nov 9 17:41:00 2014 -0800 ---------------------------------------------------------------------- README.md | 3 ++- docs/index.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/6824af0c/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 9916ac7..8d57d50 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 http://git-wip-us.apache.org/repos/asf/spark/blob/6824af0c/docs/index.md ---------------------------------------------------------------------- diff --git a/docs/index.md b/docs/index.md index edd622e..171d6dd 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/), --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
