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

Author: pommedeterresautee

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

@@ -23,7 +23,7 @@
 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',