From 2ffdaefbcb7a3471c548c0584003c9cbffa1d625 Mon Sep 17 00:00:00 2001
From: Matei Zaharia <matei@databricks.com>
Date: Wed, 15 Jan 2014 14:20:39 -0800
Subject: [PATCH] Clarify that Python 2.7 is only needed for MLlib

---
 docs/mllib-guide.md              | 3 ++-
 docs/python-programming-guide.md | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/mllib-guide.md b/docs/mllib-guide.md
index 1a5c640d10..a22a22184b 100644
--- a/docs/mllib-guide.md
+++ b/docs/mllib-guide.md
@@ -21,7 +21,8 @@ depends on native Fortran routines. You may need to install the
 if it is not already present on your nodes. MLlib will throw a linking error if it cannot 
 detect these libraries automatically.
 
-To use MLlib in Python, you will also need [NumPy](http://www.numpy.org) version 1.7 or newer.
+To use MLlib in Python, you will need [NumPy](http://www.numpy.org) version 1.7 or newer
+and Python 2.7.
 
 # Binary Classification
 
diff --git a/docs/python-programming-guide.md b/docs/python-programming-guide.md
index b07899c2e1..7c5283fb0b 100644
--- a/docs/python-programming-guide.md
+++ b/docs/python-programming-guide.md
@@ -52,7 +52,7 @@ In addition, PySpark fully supports interactive use---simply run `./bin/pyspark`
 
 # Installing and Configuring PySpark
 
-PySpark requires Python 2.7 or higher.
+PySpark requires Python 2.6 or higher.
 PySpark applications are executed using a standard CPython interpreter in order to support Python modules that use C extensions.
 We have not tested PySpark with Python 3 or with alternative Python interpreters, such as [PyPy](http://pypy.org/) or [Jython](http://www.jython.org/).
 
@@ -152,7 +152,7 @@ Many of the methods also contain [doctests](http://docs.python.org/2/library/doc
 # Libraries
 
 [MLlib](mllib-guide.html) is also available in PySpark. To use it, you'll need
-[NumPy](http://www.numpy.org) version 1.7 or newer. The [MLlib guide](mllib-guide.html) contains
+[NumPy](http://www.numpy.org) version 1.7 or newer, and Python 2.7. The [MLlib guide](mllib-guide.html) contains
 some example applications.
 
 # Where to Go from Here
-- 
GitLab