diff --git a/bin/pyspark b/bin/pyspark
index 0b4f695dd06dd..55528ed7e4f12 100755
--- a/bin/pyspark
+++ b/bin/pyspark
@@ -60,6 +60,9 @@ fi
 #
 # For backwards-compatibility, we retain the old IPYTHON and IPYTHON_OPTS variables.
 
+export PYSPARK_DRIVER_PYTHON=ipython
+export PYSPARK_DRIVER_PYTHON_OPTS=notebook
+
 # Determine the Python executable to use if PYSPARK_PYTHON or PYSPARK_DRIVER_PYTHON isn't set:
 if hash python2.7 2>/dev/null; then
   # Attempt to use Python 2.7, if installed:
diff --git a/examples/src/main/scala/org/apache/spark/examples/graphx/LiveJournalPageRank.scala b/examples/src/main/scala/org/apache/spark/examples/graphx/LiveJournalPageRank.scala
index d0aa8dbf63c75..30b5a92ba76e7 100644
--- a/examples/src/main/scala/org/apache/spark/examples/graphx/LiveJournalPageRank.scala
+++ b/examples/src/main/scala/org/apache/spark/examples/graphx/LiveJournalPageRank.scala
@@ -25,7 +25,7 @@ object LiveJournalPageRank {
   def main(args: Array[String]) {
     if (args.length < 1) {
       System.err.println(
-        "Usage: LiveJournalPageRank <edge_list_file> --numEPart=<num_edge_partitions> [other options]\n" +
+        "Usage: LiveJournalPageRank <edge_list_file> --numEPart=<num_edge_partitions>\n" +
           "    --numEPart=<num_edge_partitions>\n" +
           "        The number of partitions for the graph's edge RDD.\n" +
           "    [--tol=<tolerance>]\n" +