Merge remote-tracking branch 'public-spark/dev' into add-version-vars-to-docs

Conflicts:
	docs/quick-start.md
This commit is contained in:
Andy Konwinski 2012-10-08 12:15:38 -07:00
commit 89f8e1c2e7
2 changed files with 7 additions and 2 deletions

View file

@ -73,8 +73,13 @@ a:hover code {
* using solution at http://stackoverflow.com/questions/8878033/how-
* to-make-twitter-bootstrap-menu-dropdown-on-hover-rather-than-click
**/
.dropdown-menu {
/* Remove the default 2px top margin which causes a small
gap between the hover trigger area and the popup menu */
margin-top: 0;
}
ul.nav li.dropdown:hover ul.dropdown-menu{
display: block;
display: block;
}
a.menu:after, .dropdown-toggle:after {
content: none;

View file

@ -8,7 +8,7 @@ title: Spark Quick Start
# Introduction
This document provides a quick-and-dirty look at Spark's API. See the [programming guide](scala-programming-guide.html) for a complete reference. To follow along with this guide, you only need to have successfully [built spark]() on one machine. Building Spark is as simple as running
This document provides a quick-and-dirty look at Spark's API. See the [programming guide](scala-programming-guide.html) for a complete reference. To follow along with this guide, you only need to have successfully built Spark on one machine. Building Spark is as simple as running
{% highlight bash %}
$ sbt/sbt package