Merge remote-tracking branch 'refs/remotes/dmlc/master'

doc/index.md

@@ -11,7 +11,7 @@ This document is hosted at http://xgboost.readthedocs.org/. You can also browse
 How to Get Started
 ------------------
 The best way to get started to learn xgboost is by the examples. There are three types of examples you can find in xgboost.
-* [Tutorials](#tutorials) are self-conatained tutorials on a complete data science tasks.
+* [Tutorials](#tutorials) are self-contained tutorials on complete data science tasks.
 * [XGBoost Code Examples](../demo/) are collections of code and benchmarks of xgboost.
   - There is a walkthrough section in this to walk you through specific API features.
 * [Highlight Solutions](#highlight-solutions) are presentations using xgboost to solve real world problems.

python-package/README.md

@@ -1,31 +0,0 @@
-XGBoost Python Package
-======================
-[![PyPI version](https://badge.fury.io/py/xgboost.svg)](http://badge.fury.io/py/xgboost)
-[![PyPI downloads](https://img.shields.io/pypi/dm/xgboost.svg)](https://pypi.python.org/pypi/xgboost/)
-
-Installation
-------------
-We are on [PyPI](https://pypi.python.org/pypi/xgboost) now. For stable version, please install using pip:
-
-* ```pip install xgboost```
-* Note for windows users: this pip installation may not work on some windows environment, and it may cause unexpected errors. pip installation on windows is currently disabled for further invesigation, please install from github.
-
-For up-to-date version, please install from github.
-
-* To make the python module, type ```./build.sh``` in the root directory of project
-* Make sure you have [setuptools](https://pypi.python.org/pypi/setuptools)
-* Install with `python setup.py install` from this directory.
-* For windows users, please use the Visual Studio project file under [windows folder](../windows/). See also the [installation tutorial](https://www.kaggle.com/c/otto-group-product-classification-challenge/forums/t/13043/run-xgboost-from-windows-and-python) from Kaggle Otto Forum.
-
-Examples
-------
-
-* Refer also to the walk through example in [demo folder](../demo/guide-python)
-* See also the [example scripts](../demo/kaggle-higgs) for Kaggle Higgs Challenge, including [speedtest script](../demo/kaggle-higgs/speedtest.py) on this dataset.
-
-Note
------
-
-* If you want to build xgboost on Mac OS X with multiprocessing support where clang in XCode by default doesn't support, please install gcc 4.9 or higher using [homebrew](http://brew.sh/) ```brew tap homebrew/versions; brew install gcc49```
-* If you want to run XGBoost process in parallel using the fork backend for joblib/multiprocessing, you must build XGBoost without support for OpenMP by `make no_omp=1`. Otherwise, use the forkserver (in Python 3.4) or spawn backend. See the [sklearn_parallel.py](../demo/guide-python/sklearn_parallel.py) demo.
-

python-package/setup.py

@@ -23,7 +23,7 @@ LIB_PATH = libpath['find_lib_path']()
 setup(name='xgboost',
       version=open(os.path.join(CURRENT_DIR, 'xgboost/VERSION')).read().strip(),
       #version='0.4a23',
-      description=open(os.path.join(CURRENT_DIR, 'README.md')).read(),
+      description=open(os.path.join(CURRENT_DIR, 'README.rst')).read(),
       install_requires=[
           'numpy',
           'scipy',