Repository: spark
Updated Branches:
  refs/heads/master f17510e37 -> 0e0686d3e


[SPARK-2003] Fix python SparkContext example

Author: Matthew Farrellee <[email protected]>

Closes #1246 from mattf/SPARK-2003 and squashes the following commits:

b12e7ca [Matthew Farrellee] [SPARK-2003] Fix python SparkContext example


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0e0686d3
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0e0686d3
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0e0686d3

Branch: refs/heads/master
Commit: 0e0686d3ef88e024fcceafe36a0cdbb953f5aeae
Parents: f17510e
Author: Matthew Farrellee <[email protected]>
Authored: Fri Jun 27 18:20:33 2014 -0700
Committer: Patrick Wendell <[email protected]>
Committed: Fri Jun 27 18:20:33 2014 -0700

----------------------------------------------------------------------
 docs/programming-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/0e0686d3/docs/programming-guide.md
----------------------------------------------------------------------
diff --git a/docs/programming-guide.md b/docs/programming-guide.md
index 65d75b8..06e4c4c 100644
--- a/docs/programming-guide.md
+++ b/docs/programming-guide.md
@@ -145,7 +145,7 @@ that contains information about your application.
 
 {% highlight python %}
 conf = SparkConf().setAppName(appName).setMaster(master)
-sc = SparkContext(conf)
+sc = SparkContext(conf=conf)
 {% endhighlight %}
 
 </div>

Reply via email to