TensorFlow: Upstream latest changes to git.

Changes:
- Documentation updates.
- Specify numpy version in required packages.

Base CL: 107344010

2 files changed, 17 insertions, 11 deletions

diff --git a/tensorflow/g3doc/get_started/basic_usage.md b/tensorflow/g3doc/get_started/basic_usage.md
index 7616c3f7ea..c29f6a4179 100644
--- a/tensorflow/g3doc/get_started/basic_usage.md
+++ b/tensorflow/g3doc/get_started/basic_usage.md
@@ -286,7 +286,8 @@ with tf.Session() as sess:
 ```
 
 A `placeholder()` operation generates an error if you do not supply a feed for
-it. See the [MNIST fully-connected feed
-tutorial](../tutorials/mnist/fully_connected_feed.py) for a larger-scale
-example of feeds.
+it. See the
+[MNIST fully-connected feed tutorial](../tutorials/mnist/tf/index.md)
+([source code](https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/g3doc/tutorials/mnist/fully_connected_feed.py))
+for a larger-scale example of feeds.
 
diff --git a/tensorflow/g3doc/get_started/os_setup.md b/tensorflow/g3doc/get_started/os_setup.md
index 4db07c233b..39ed870556 100644
--- a/tensorflow/g3doc/get_started/os_setup.md
+++ b/tensorflow/g3doc/get_started/os_setup.md
@@ -2,8 +2,13 @@
 
 ## Binary Installation <a class="md-anchor" id="AUTOGENERATED-binary-installation"></a>
 
+The TensorFlow Python API requires Python 2.7.
+
 ### Ubuntu/Linux <a class="md-anchor" id="AUTOGENERATED-ubuntu-linux"></a>
 
+**Note**: All the virtualenv-related instructions are optional, but we recommend
+using the virtualenv on any multi-user system.
+
 Make sure you have [pip](https://pypi.python.org/pypi/pip), the python headers,
 and (optionally) [virtualenv](https://pypi.python.org/pypi/virtualenv) installed:
 
@@ -11,10 +16,7 @@ and (optionally) [virtualenv](https://pypi.python.org/pypi/virtualenv) installed
 $ sudo apt-get install python-pip python-dev python-virtualenv
 ```
 
-**Note**: All the virtualenv-related instructions are optional, but we recommend
-using the virtualenv on any multi-user system.
-
-Set up a new virtualenv environment.  Assuming you want to set it up in the
+Set up a new virtualenv environment.  To set it up in the
 directory `~/tensorflow`, run:
 
 ```bash
@@ -39,18 +41,19 @@ Inside the virtualenv, install TensorFlow:
 # For GPU-enabled version (only install this version if you have the CUDA sdk installed)
 (tensorflow)$ pip install --upgrade https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-0.5.0-cp27-none-linux_x86_64.whl
 
+# When you are done using TensorFlow:
 (tensorflow)$ deactivate  # Deactivate the virtualenv
 $  # Your prompt should change back
 ```
 
 ### Mac OS X <a class="md-anchor" id="AUTOGENERATED-mac-os-x"></a>
 
-Make sure you have [pip](https://pypi.python.org/pypi/pip) and
-(optionally) [virtualenv](https://pypi.python.org/pypi/virtualenv) installed:
-
 **Note**: All the virtualenv-related instructions are optional, but we recommend
 using the virtualenv on any multi-user system.
 
+Make sure you have [pip](https://pypi.python.org/pypi/pip) and
+(optionally) [virtualenv](https://pypi.python.org/pypi/virtualenv) installed:
+
 If using `easy_install`:
 
 ```bash
@@ -78,6 +81,8 @@ Install TensorFlow (only CPU binary version is currently available).
 
 ```bash
 (tensorflow)$ pip install --upgrade https://storage.googleapis.com/tensorflow/mac/tensorflow-0.5.0-py2-none-any.whl
+
+# When you are done using TensorFlow:
 (tensorflow)$ deactivate  # Deactivate the virtualenv
 $  # Your prompt should change back
 ```
@@ -184,7 +189,7 @@ Add the executable `output/bazel` to your `$PATH` environment variable.
 $ sudo apt-get install python-numpy swig python-dev
 ```
 
-#### <a name="install_cuda"></a>Optional: Install CUDA (GPUs on Linux) <a class="md-anchor" id="AUTOGENERATED--a-name--install_cuda----a-optional--install-cuda--gpus-on-linux-"></a>
+#### Optional: Install CUDA (GPUs on Linux) <a class="md-anchor" id="install_cuda"></a>
 
 In order to build or run TensorFlow with GPU support, both Cuda Toolkit 7.0 and
 CUDNN 6.5 V2 from NVIDIA need to be installed.