Repository: spark
Updated Branches:
  refs/heads/branch-1.3 6f10142de -> e5451432e


Update the command to use IPython notebook

As for "notebook --pylab inline" is not supported any more, update the related 
documentation for this.

Author: Cong Yue <yuecong1...@gmail.com>

Closes #5111 from yuecong/patch-1 and squashes the following commits:

872df76 [Cong Yue] Update the command to use IPython notebook

(cherry picked from commit c12312f8b16bb8f9355d5f9e786c5a608863eb01)
Signed-off-by: Sean Owen <so...@cloudera.com>


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

Branch: refs/heads/branch-1.3
Commit: e5451432e3c7412e9bace66386b209f4b824dbcb
Parents: 6f10142
Author: Cong Yue <yuecong1...@gmail.com>
Authored: Tue Mar 24 12:56:13 2015 +0000
Committer: Sean Owen <so...@cloudera.com>
Committed: Tue Mar 24 13:01:19 2015 +0000

----------------------------------------------------------------------
 docs/programming-guide.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/e5451432/docs/programming-guide.md
----------------------------------------------------------------------
diff --git a/docs/programming-guide.md b/docs/programming-guide.md
index 47fd2bf..796c9f5 100644
--- a/docs/programming-guide.md
+++ b/docs/programming-guide.md
@@ -237,9 +237,13 @@ You can customize the `ipython` command by setting 
`PYSPARK_DRIVER_PYTHON_OPTS`.
 the [IPython Notebook](http://ipython.org/notebook.html) with PyLab plot 
support:
 
 {% highlight bash %}
-$ PYSPARK_DRIVER_PYTHON=ipython PYSPARK_DRIVER_PYTHON_OPTS="notebook --pylab 
inline" ./bin/pyspark
+$ PYSPARK_DRIVER_PYTHON=ipython PYSPARK_DRIVER_PYTHON_OPTS="notebook" 
./bin/pyspark
 {% endhighlight %}
 
+After the IPython Notebook server is launched, you can create a new "Python 2" 
notebook from 
+the "Files" tab. Inside the notebook, you can input the command `%pylab 
inline` as part of 
+your notebook before you start to try Spark from the IPython notebook.
+
 </div>
 
 </div>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to