fix docs

markhamstra · Jan 28, 2015 · 14ae7e2 · 14ae7e2
1 parent 54ca7df
commit 14ae7e2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/python/docs/conf.py b/python/docs/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2-SNAPSHOT'
+version = '1.3-SNAPSHOT'
 # The full version, including alpha/beta/rc tags.
-release = '1.2-SNAPSHOT'
+release = '1.3-SNAPSHOT'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/python/docs/index.rst b/python/docs/index.rst
@@ -14,6 +14,7 @@ Contents:
    pyspark
    pyspark.sql
    pyspark.streaming
+   pyspark.ml
    pyspark.mllib
 
 

diff --git a/python/docs/pyspark.ml.rst b/python/docs/pyspark.ml.rst
@@ -10,16 +10,6 @@ pyspark.ml module
 .. automodule:: pyspark.ml
     :members:
     :undoc-members:
-    :show-inheritance:
-    :inherited-members:
-
-pyspark.ml.param module
------------------------
-
-.. automodule:: pyspark.ml.param
-    :members:
-    :undoc-members:
-    :show-inheritance:
     :inherited-members:
 
 pyspark.ml.feature module
@@ -28,7 +18,6 @@ pyspark.ml.feature module
 .. automodule:: pyspark.ml.feature
     :members:
     :undoc-members:
-    :show-inheritance:
     :inherited-members:
 
 pyspark.ml.classification module
@@ -37,5 +26,4 @@ pyspark.ml.classification module
 .. automodule:: pyspark.ml.classification
     :members:
     :undoc-members:
-    :show-inheritance:
     :inherited-members:
diff --git a/python/pyspark/ml/__init__.py b/python/pyspark/ml/__init__.py
@@ -18,4 +18,4 @@
 from pyspark.ml.param import *
 from pyspark.ml.pipeline import *
 
-__all__ = ["Param", "Params", "Pipeline", "Transformer", "Estimator"]
+__all__ = ["Param", "Params", "Transformer", "Estimator", "Pipeline"]