diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
| commit | 604fad9c39763012d97b404941f7ba7137ec2eed (patch) | |
| tree | a327c39fcf9ac53e17fbeb5dfedb11e04f505f3c /docs/java-programming-guide.md | |
| parent | 9e6f3bdcda1ab48159afa4f54b64d05e42a8688e (diff) | |
| parent | c4d6145f7fde8a516024e886314bf8fecde817ea (diff) | |
| download | spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.gz spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.bz2 spark-604fad9c39763012d97b404941f7ba7137ec2eed.zip | |
Merge remote-tracking branch 'apache-github/master' into remove-binaries
Conflicts:
core/src/test/scala/org/apache/spark/DriverSuite.scala
docs/python-programming-guide.md
Diffstat (limited to 'docs/java-programming-guide.md')
| -rw-r--r-- | docs/java-programming-guide.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/java-programming-guide.md b/docs/java-programming-guide.md index 53085cc671..07732fa122 100644 --- a/docs/java-programming-guide.md +++ b/docs/java-programming-guide.md @@ -190,9 +190,9 @@ We hope to generate documentation with Java-style syntax in the future. Spark includes several sample programs using the Java API in [`examples/src/main/java`](https://github.com/apache/incubator-spark/tree/master/examples/src/main/java/org/apache/spark/examples). You can run them by passing the class name to the -`run-example` script included in Spark; for example: +`bin/run-example` script included in Spark; for example: - ./run-example org.apache.spark.examples.JavaWordCount + ./bin/run-example org.apache.spark.examples.JavaWordCount Each example program prints usage help when run without any arguments. |