diff options
author | Matei Zaharia <matei@databricks.com> | 2014-05-30 00:34:33 -0700 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-05-30 00:34:33 -0700 |
commit | c8bf4131bc2a2e147e977159fc90e94b85738830 (patch) | |
tree | a2f885df8fb6654bd7750bb344b97a6cb6889bf3 /docs/_layouts | |
parent | eeee978a348ec2a35cc27865cea6357f9db75b74 (diff) | |
download | spark-c8bf4131bc2a2e147e977159fc90e94b85738830.tar.gz spark-c8bf4131bc2a2e147e977159fc90e94b85738830.tar.bz2 spark-c8bf4131bc2a2e147e977159fc90e94b85738830.zip |
[SPARK-1566] consolidate programming guide, and general doc updates
This is a fairly large PR to clean up and update the docs for 1.0. The major changes are:
* A unified programming guide for all languages replaces language-specific ones and shows language-specific info in tabs
* New programming guide sections on key-value pairs, unit testing, input formats beyond text, migrating from 0.9, and passing functions to Spark
* Spark-submit guide moved to a separate page and expanded slightly
* Various cleanups of the menu system, security docs, and others
* Updated look of title bar to differentiate the docs from previous Spark versions
You can find the updated docs at http://people.apache.org/~matei/1.0-docs/_site/ and in particular http://people.apache.org/~matei/1.0-docs/_site/programming-guide.html.
Author: Matei Zaharia <matei@databricks.com>
Closes #896 from mateiz/1.0-docs and squashes the following commits:
03e6853 [Matei Zaharia] Some tweaks to configuration and YARN docs
0779508 [Matei Zaharia] tweak
ef671d4 [Matei Zaharia] Keep frames in JavaDoc links, and other small tweaks
1bf4112 [Matei Zaharia] Review comments
4414f88 [Matei Zaharia] tweaks
d04e979 [Matei Zaharia] Fix some old links to Java guide
a34ed33 [Matei Zaharia] tweak
541bb3b [Matei Zaharia] miscellaneous changes
fcefdec [Matei Zaharia] Moved submitting apps to separate doc
61d72b4 [Matei Zaharia] stuff
181f217 [Matei Zaharia] migration guide, remove old language guides
e11a0da [Matei Zaharia] Add more API functions
6a030a9 [Matei Zaharia] tweaks
8db0ae3 [Matei Zaharia] Added key-value pairs section
318d2c9 [Matei Zaharia] tweaks
1c81477 [Matei Zaharia] New section on basics and function syntax
e38f559 [Matei Zaharia] Actually added programming guide to Git
a33d6fe [Matei Zaharia] First pass at updating programming guide to support all languages, plus other tweaks throughout
3b6a876 [Matei Zaharia] More CSS tweaks
01ec8bf [Matei Zaharia] More CSS tweaks
e6d252e [Matei Zaharia] Change color of doc title bar to differentiate from 0.9.0
Diffstat (limited to 'docs/_layouts')
-rwxr-xr-x | docs/_layouts/global.html | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/docs/_layouts/global.html b/docs/_layouts/global.html index fb808129bb..4ba20e590f 100755 --- a/docs/_layouts/global.html +++ b/docs/_layouts/global.html @@ -9,6 +9,11 @@ <title>{{ page.title }} - Spark {{site.SPARK_VERSION_SHORT}} Documentation</title> <meta name="description" content=""> + {% if page.redirect %} + <meta http-equiv="refresh" content="0; url={{page.redirect}}"> + <link rel="canonical" href="{{page.redirect}}" /> + {% endif %} + <link rel="stylesheet" href="css/bootstrap.min.css"> <style> body { @@ -61,15 +66,13 @@ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Programming Guides<b class="caret"></b></a> <ul class="dropdown-menu"> <li><a href="quick-start.html">Quick Start</a></li> - <li><a href="scala-programming-guide.html">Spark in Scala</a></li> - <li><a href="java-programming-guide.html">Spark in Java</a></li> - <li><a href="python-programming-guide.html">Spark in Python</a></li> + <li><a href="programming-guide.html">Spark Programming Guide</a></li> <li class="divider"></li> <li><a href="streaming-programming-guide.html">Spark Streaming</a></li> <li><a href="sql-programming-guide.html">Spark SQL</a></li> <li><a href="mllib-guide.html">MLlib (Machine Learning)</a></li> - <li><a href="bagel-programming-guide.html">Bagel (Pregel on Spark)</a></li> <li><a href="graphx-programming-guide.html">GraphX (Graph Processing)</a></li> + <li><a href="bagel-programming-guide.html">Bagel (Pregel on Spark)</a></li> </ul> </li> @@ -86,6 +89,8 @@ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Deploying<b class="caret"></b></a> <ul class="dropdown-menu"> <li><a href="cluster-overview.html">Overview</a></li> + <li><a href="submitting-applications.html">Submitting Applications</a></li> + <li class="divider"></li> <li><a href="ec2-scripts.html">Amazon EC2</a></li> <li><a href="spark-standalone.html">Standalone Mode</a></li> <li><a href="running-on-mesos.html">Mesos</a></li> @@ -99,9 +104,10 @@ <li><a href="configuration.html">Configuration</a></li> <li><a href="monitoring.html">Monitoring</a></li> <li><a href="tuning.html">Tuning Guide</a></li> - <li><a href="hadoop-third-party-distributions.html">Running with CDH/HDP</a></li> - <li><a href="hardware-provisioning.html">Hardware Provisioning</a></li> <li><a href="job-scheduling.html">Job Scheduling</a></li> + <li><a href="security.html">Security</a></li> + <li><a href="hardware-provisioning.html">Hardware Provisioning</a></li> + <li><a href="hadoop-third-party-distributions.html">3<sup>rd</sup>-Party Hadoop Distros</a></li> <li class="divider"></li> <li><a href="building-with-maven.html">Building Spark with Maven</a></li> <li><a href="https://cwiki.apache.org/confluence/display/SPARK/Contributing+to+Spark">Contributing to Spark</a></li> |