diff --git a/site/versions/master/docs/windows.md b/site/versions/master/docs/windows.md
index 2e8c8ab..e164ce2 100644
--- a/site/versions/master/docs/windows.md
+++ b/site/versions/master/docs/windows.md
@@ -84,16 +84,17 @@
 
 * [Visual Studio](https://www.visualstudio.com/)
 <br/>We are using MSVC as the native C++ toolchain, so please ensure you have Visual
-Studio installed with the Visual C++ components
+Studio installed with the `Visual C++ > Common Tools for Visual C++` and
+`Visual C++ > Microsoft Foundation Classes for C++` features.
 (which is NOT the default installation type of Visual Studio).
-You can set BAZEL\_VS environment variable to tell Bazel
+You can set `BAZEL_VS` environment variable to tell Bazel
 where Visual Studio is, otherwise Bazel will try to find the latest version installed.
 <br/>For example: `export BAZEL_VS="C:/Program Files (x86)/Microsoft Visual Studio 14.0"`
 
 * [Python 2.7](https://www.python.org/downloads/)
 <br/>Currently, we use python wrapper scripts to call the actual MSVC compiler, so
 please make sure Python is installed and its location is added into PATH.
-It's also a good idea to set BAZEL\_PYTHON environment variable to tell Bazel
+It's also a good idea to set `BAZEL_PYTHON` environment variable to tell Bazel
 where python is.
 <br/>For example: `export BAZEL_PYTHON=C:/Python27/python.exe`