diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
index d9aa8e614eb9b..46f1980ffe942 100644
--- a/core/src/main/scala/org/apache/spark/SparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -1050,7 +1050,6 @@ class SparkContext(config: SparkConf) extends Logging {
   }
 
   /**
-   *
    * Submit a job for execution and return a FutureJob holding the result.
    */
   @Experimental
diff --git a/docs/_config.yml b/docs/_config.yml
index 5e69c5626f131..aa5a5adbc1743 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,5 @@
 pygments: true
-markdown: rdiscount
+markdown: kramdown
 
 # These allow the documentation to be updated with nerw releases
 # of Spark, Scala, and Mesos.
diff --git a/docs/_plugins/copy_api_dirs.rb b/docs/_plugins/copy_api_dirs.rb
index df03ea5c620ae..bbd56d2fd13bb 100644
--- a/docs/_plugins/copy_api_dirs.rb
+++ b/docs/_plugins/copy_api_dirs.rb
@@ -62,19 +62,19 @@
     File.open(css_file, 'a') { |f| f.write("\n" + css.join()) }
   end
 
-#  # Build Epydoc for Python
-#  puts "Moving to python directory and building epydoc."
-#  cd("../python")
-#  puts `epydoc --config epydoc.conf`
-#
-#  puts "Moving back into docs dir."
-#  cd("../docs")
-#
-#  puts "echo making directory pyspark"
-#  mkdir_p "pyspark"
-#
-#  puts "cp -r ../python/docs/. api/pyspark"
-#  cp_r("../python/docs/.", "api/pyspark")
-#
-#  cd("..")
+  # Build Epydoc for Python
+  puts "Moving to python directory and building epydoc."
+  cd("../python")
+  puts `epydoc --config epydoc.conf`
+
+  puts "Moving back into docs dir."
+  cd("../docs")
+
+  puts "echo making directory pyspark"
+  mkdir_p "pyspark"
+
+  puts "cp -r ../python/docs/. api/pyspark"
+  cp_r("../python/docs/.", "api/pyspark")
+
+  cd("..")
 end
diff --git a/docs/js/api-docs.js b/docs/js/api-docs.js
index 832f41958fc81..1d234658e7ee9 100644
--- a/docs/js/api-docs.js
+++ b/docs/js/api-docs.js
@@ -24,4 +24,4 @@ function addBadges(allAnnotations, name, tag, html) {
   tags.prevAll("h4.signature").prepend(html);
   annotations.closest("div.fullcomment").prevAll("h4.signature").prepend(html);
   annotations.closest("div.fullcommenttop").prepend(html);
-}
\ No newline at end of file
+}