aboutsummaryrefslogtreecommitdiff
path: root/python/docs
diff options
context:
space:
mode:
authorJoseph K. Bradley <joseph@databricks.com>2015-02-20 02:31:32 -0800
committerXiangrui Meng <meng@databricks.com>2015-02-20 02:31:32 -0800
commit4a17eedb16343413e5b6f8bb58c6da8952ee7ab6 (patch)
treeac17fd9eed4f42ba3095b148c68d4e78b6afc875 /python/docs
parentd3dfebebce9f76e4433e16d4d6d29fb8fa4d4193 (diff)
downloadspark-4a17eedb16343413e5b6f8bb58c6da8952ee7ab6.tar.gz
spark-4a17eedb16343413e5b6f8bb58c6da8952ee7ab6.tar.bz2
spark-4a17eedb16343413e5b6f8bb58c6da8952ee7ab6.zip
[SPARK-5867] [SPARK-5892] [doc] [ml] [mllib] Doc cleanups for 1.3 release
For SPARK-5867: * The spark.ml programming guide needs to be updated to use the new SQL DataFrame API instead of the old SchemaRDD API. * It should also include Python examples now. For SPARK-5892: * Fix Python docs * Various other cleanups BTW, I accidentally merged this with master. If you want to compile it on your own, use this branch which is based on spark/branch-1.3 and cherry-picks the commits from this PR: [https://github.com/jkbradley/spark/tree/doc-review-1.3-check] CC: mengxr (ML), davies (Python docs) Author: Joseph K. Bradley <joseph@databricks.com> Closes #4675 from jkbradley/doc-review-1.3 and squashes the following commits: f191bb0 [Joseph K. Bradley] small cleanups e786efa [Joseph K. Bradley] small doc corrections 6b1ab4a [Joseph K. Bradley] fixed python lint test 946affa [Joseph K. Bradley] Added sample data for ml.MovieLensALS example. Changed spark.ml Java examples to use DataFrames API instead of sql() da81558 [Joseph K. Bradley] Merge remote-tracking branch 'upstream/master' into doc-review-1.3 629dbf5 [Joseph K. Bradley] Updated based on code review: * made new page for old migration guides * small fixes * moved inherit_doc in python b9df7c4 [Joseph K. Bradley] Small cleanups: toDF to toDF(), adding s for string interpolation 34b067f [Joseph K. Bradley] small doc correction da16aef [Joseph K. Bradley] Fixed python mllib docs 8cce91c [Joseph K. Bradley] GMM: removed old imports, added some doc 695f3f6 [Joseph K. Bradley] partly done trying to fix inherit_doc for class hierarchies in python docs a72c018 [Joseph K. Bradley] made ChiSqTestResult appear in python docs b05a80d [Joseph K. Bradley] organize imports. doc cleanups e572827 [Joseph K. Bradley] updated programming guide for ml and mllib
Diffstat (limited to 'python/docs')
-rw-r--r--python/docs/pyspark.mllib.rst11
1 files changed, 3 insertions, 8 deletions
diff --git a/python/docs/pyspark.mllib.rst b/python/docs/pyspark.mllib.rst
index 21f66ca344..b706c5e376 100644
--- a/python/docs/pyspark.mllib.rst
+++ b/python/docs/pyspark.mllib.rst
@@ -7,7 +7,7 @@ pyspark.mllib.classification module
.. automodule:: pyspark.mllib.classification
:members:
:undoc-members:
- :show-inheritance:
+ :inherited-members:
pyspark.mllib.clustering module
-------------------------------
@@ -15,7 +15,6 @@ pyspark.mllib.clustering module
.. automodule:: pyspark.mllib.clustering
:members:
:undoc-members:
- :show-inheritance:
pyspark.mllib.feature module
-------------------------------
@@ -39,7 +38,6 @@ pyspark.mllib.random module
.. automodule:: pyspark.mllib.random
:members:
:undoc-members:
- :show-inheritance:
pyspark.mllib.recommendation module
-----------------------------------
@@ -47,7 +45,6 @@ pyspark.mllib.recommendation module
.. automodule:: pyspark.mllib.recommendation
:members:
:undoc-members:
- :show-inheritance:
pyspark.mllib.regression module
-------------------------------
@@ -55,7 +52,7 @@ pyspark.mllib.regression module
.. automodule:: pyspark.mllib.regression
:members:
:undoc-members:
- :show-inheritance:
+ :inherited-members:
pyspark.mllib.stat module
-------------------------
@@ -63,7 +60,6 @@ pyspark.mllib.stat module
.. automodule:: pyspark.mllib.stat
:members:
:undoc-members:
- :show-inheritance:
pyspark.mllib.tree module
-------------------------
@@ -71,7 +67,7 @@ pyspark.mllib.tree module
.. automodule:: pyspark.mllib.tree
:members:
:undoc-members:
- :show-inheritance:
+ :inherited-members:
pyspark.mllib.util module
-------------------------
@@ -79,4 +75,3 @@ pyspark.mllib.util module
.. automodule:: pyspark.mllib.util
:members:
:undoc-members:
- :show-inheritance: