Add --spawn_strategy=standalone to os_setup.md

tensorflow/g3doc/get_started/os_setup.md

@@ -310,7 +310,7 @@ depends on.
 #### Install Bazel
 
 Follow instructions [here](http://bazel.io/docs/install.html) to install the
-dependencies for Bazel. Then download the latest stable bazel version using the
+dependencies for bazel. Then download the latest stable bazel version using the
 [installer for your system](https://github.com/bazelbuild/bazel/releases) and
 run the installer as mentioned there:
 
@@ -408,7 +408,7 @@ you invoke the bazel build command.
 From the root of your source tree, run:
 
 ```bash
-$ bazel build -c opt --config=cuda //tensorflow/cc:tutorials_example_trainer
+$ bazel build -c opt --config=cuda --spawn_strategy=standalone //tensorflow/cc:tutorials_example_trainer
 
 $ bazel-bin/tensorflow/cc/tutorials_example_trainer --use_gpu
 # Lots of output. This tutorial iteratively calculates the major eigenvalue of
@@ -451,7 +451,7 @@ Configuration finished
 ##### Known issues
 
 * Although it is possible to build both Cuda and non-Cuda configs under the same
-source tree, we recommend to run "bazel clean" when switching between these two
+source tree, we recommend to run `bazel clean` when switching between these two
 configs in the same source tree.
 
 * You have to run configure before running bazel build. Otherwise, the build
@@ -470,7 +470,7 @@ case, be sure to install its dependency [PCRE](from www.pcre.org) and not PCRE2.
 #### Dependencies
 
 Follow instructions [here](http://bazel.io/docs/install.html) to install the
-dependencies for Bazel. You can then use homebrew to install bazel and SWIG:
+dependencies for bazel. You can then use homebrew to install bazel and SWIG:
 
 ```bash
 $ brew install bazel swig
@@ -507,18 +507,43 @@ Do you wish to build TensorFlow with GPU support? [y/N]
 
 ### Create the pip package and install
 
+When building from source, you will still build a pip package and install that.
+
 ```bash
-$ bazel build -c opt //tensorflow/tools/pip_package:build_pip_package
+$ bazel build -c opt --spawn_strategy=standalone //tensorflow/tools/pip_package:build_pip_package
 
 # To build with GPU support:
-$ bazel build -c opt --config=cuda //tensorflow/tools/pip_package:build_pip_package
+$ bazel build -c opt --config=cuda --spawn_strategy=standalone //tensorflow/tools/pip_package:build_pip_package
 
 $ bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_pkg
 
 # The name of the .whl file will depend on your platform.
 $ pip install /tmp/tensorflow_pkg/tensorflow-0.6.0-cp27-none-linux_x86_64.whl
 ```
 
+## Setting up TensorFlow for Development
+
+If you're working on TensorFlow itself, it is useful to be able to test your
+changes in an interactive python shell without having to reinstall TensorFlow.
+
+To set up TensorFlow such that all files are linked (instead of copied) from the
+system directories, run the following commands inside the TensorFlow root
+directory:
+
+```bash
+bazel build -c opt --spawn_strategy=standalone //tensorflow/tools/pip_package:build_pip_package
+mkdir _python_build
+cd _python_build
+ln -s ../bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/* .
+ln -s ../tensorflow/tools/pip_package/* .
+python setup.py develop
+```
+
+Note that this setup still requires you to rebuild the
+`//tensorflow/tools/pip_package:build_pip_package` target every time you change
+a C++ file; add, delete, or move any python file; or if you change bazel build
+rules.
+
 ## Train your first TensorFlow neural net model
 
 Starting from the root of your source tree, run:
@@ -547,29 +572,6 @@ Validation error: 7.0%
 ...
 ```
 
-## Setting up TensorFlow for Development
-
-If you're working on TensorFlow itself, it is useful to be able to test your
-changes in an interactive python shell without having to reinstall TensorFlow.
-
-To set up TensorFlow such that all files are linked (instead of copied) from the
-system directories, run the following commands inside the TensorFlow root
-directory:
-
-```bash
-bazel build -c opt //tensorflow/tools/pip_package:build_pip_package
-mkdir _python_build
-cd _python_build
-ln -s ../bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/* .
-ln -s ../tensorflow/tools/pip_package/* .
-python setup.py develop
-```
-
-Note that this setup still requires you to rebuild the
-`//tensorflow/tools/pip_package:build_pip_package` target every time you change
-a C++ file; add, delete, or move any python file; or if you change bazel build
-rules.
-
 ## Common Problems
 
 ### GPU-related issues