Update to Bazel's installation instructions:

- adding doc about Ubuntu 16.04
- removing doc about Ubuntu 14.04
- individual platform instructions now chunked into separate doc topics

--
PiperOrigin-RevId: 150856210
MOS_MIGRATED_REVID=150856210

7 files changed, 312 insertions, 301 deletions

diff --git a/site/versions/master/docs/bazel-overview.md b/site/versions/master/docs/bazel-overview.md
index ec2e5b0b5e..76c07c965d 100644
--- a/site/versions/master/docs/bazel-overview.md
+++ b/site/versions/master/docs/bazel-overview.md
@@ -60,7 +60,7 @@ Hermetic rules and sandboxing allows Bazel to produce correct, reproducible
 artifacts and test results. Caching allows reuse of build artifacts and test
 results.
 
-Bazel’s builds are fast. Incremental builds allows Bazel to do the minimum
+Bazel’s builds are fast. Incremental builds allow Bazel to do the minimum
 required work for a rebuild or retest. Correct and reproducible builds allow
 Bazel to reuse cached artifacts for whatever is not changed. If you change a
 library, Bazel will not rebuild your entire source.
diff --git a/site/versions/master/docs/install-compile-source.md b/site/versions/master/docs/install-compile-source.md
new file mode 100644
index 0000000000..0291fe6d31
--- /dev/null
+++ b/site/versions/master/docs/install-compile-source.md
@@ -0,0 +1,53 @@
+---
+layout: documentation
+title: Compile Bazel from Source
+---
+
+# <a name="compiling-from-source"></a>Compile Bazel from source
+
+The standard way of compiling a release version of Bazel from source
+is to use a distribution archive. Download `bazel-<VERSION>-dist.zip`
+from
+the [release page](https://github.com/bazelbuild/bazel/releases) for
+the desired version. We recommend to also verify the signature made by our
+[release key](https://bazel.build/bazel-release.pub.gpg) 48457EE0.
+
+Unzip the archive and call `bash ./compile.sh`; this will create a
+bazel binary in `output/bazel`. This binary is self-contained,
+so it can be copied to a directory on the PATH (e.g.,
+`/usr/local/bin`) or used in-place.
+
+##<a name="compiling-from-source-issues"></a>Known issues when compiling from source
+
+**On Windows:**
+
+* version 0.4.4 and below: `compile.sh` may fail right after start with an error
+  like this:
+
+    ```
+    File not found - *.jar
+    no error prone jar
+    ```
+
+    Workaround is to run this (and add it to your `~/.bashrc`):
+
+    ```
+    export PATH="/bin:/usr/bin:$PATH"
+    ```
+
+* version 0.4.3 and below: `compile.sh` may fail fairly early with many Java
+  compilation errors. The errors look similar to:
+
+    ```
+    C:\...\bazel_VR1HFY7x\src\com\google\devtools\build\lib\remote\ExecuteServiceGrpc.java:11: error: package io.grpc.stub does not exist
+    import static io.grpc.stub.ServerCalls.asyncUnaryCall;
+                              ^
+    ```
+
+    This is caused by a bug in one of the bootstrap scripts
+    (`scripts/bootstrap/compile.sh`). Manually apply this one-line fix if you want
+    to build Bazel purely from source (without using an existing Bazel binary):
+    [5402993a5e9065984a42eca2132ec56ca3aa456f]( https://github.com/bazelbuild/bazel/commit/5402993a5e9065984a42eca2132ec56ca3aa456f).
+
+* version 0.3.2 and below:
+  [github issue #1919](https://github.com/bazelbuild/bazel/issues/1919)
diff --git a/site/versions/master/docs/install-os-x.md b/site/versions/master/docs/install-os-x.md
new file mode 100644
index 0000000000..f18b7666c2
--- /dev/null
+++ b/site/versions/master/docs/install-os-x.md
@@ -0,0 +1,107 @@
+--------------------------------------------------------------------------------
+
+layout: documentation
+
+## title: Installing Bazel on macOS (OS X)
+
+# <a name="mac-os-x"></a>Install Bazel on macOS (OS X)
+
+Install Bazel on macOS (OS X) using one of the following methods:
+
+*   [Use Homebrew](#install-on-mac-os-x-homebrew)
+*   [Use the binary installer](#install-with-installer-mac-os-x)
+*   [Compile Bazel from source](install-compile-source.md)
+
+Bazel comes with two completion scripts. After installing Bazel, you can:
+
+*   access the [bash completion script](install.md)
+*   install the [zsh completion script](install.md)
+
+## <a name="install-on-mac-os-x-homebrew"></a>Install using Homebrew
+
+### 1. Install JDK 8
+
+JDK 8 can be downloaded from [Oracle's JDK
+Page](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html).
+Look for "Mac OS X" under "Java SE Development Kit". This will download a DMG
+image with an install wizard.
+
+### 2. Install Homebrew on macOS (OS X)
+
+Installing Homebrew is a one-time setup:
+
+`$ /usr/bin/ruby -e "$(curl -fsSL
+https://raw.githubusercontent.com/Homebrew/install/master/install)"`
+
+### 3. Install Bazel Homebrew Package
+
+`$ brew install bazel`
+
+You are all set. You can confirm Bazel is installed successfully by running
+`bazel version`.
+
+You can later upgrade to newer version of Bazel with `brew upgrade bazel`.
+
+## <a name="install-with-installer-mac-os-x"></a>Install with installer
+
+We provide binary installers on our
+<a href="https://github.com/bazelbuild/bazel/releases">GitHub releases page</a>
+
+The installer only contains Bazel binary, some additional libraries are required
+to be installed on the machine to work.
+
+### 1. Install JDK 8
+
+JDK 8 can be downloaded from [Oracle's JDK
+Page](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html).
+Look for "Mac OS X" under "Java SE Development Kit". This will download a DMG
+image with an install wizard.
+
+### 2. Install XCode command line tools
+
+Xcode can be downloaded from the [Apple Developer
+Site](https://developer.apple.com/xcode/downloads/), which will redirect to the
+App Store.
+
+For `objc_*` and `ios_*` rule support, you must have Xcode 6.1 or later with iOS
+SDK 8.1 installed on your system.
+
+Once XCode is installed you can trigger signing the license with the following
+command:
+
+```
+$ sudo gcc --version
+```
+
+### 3. Download Bazel
+
+Download the [Bazel installer](https://github.com/bazelbuild/bazel/releases) for
+your operating system.
+
+### 4. Run the installer
+
+Run the installer:
+
+<pre>
+$ chmod +x bazel-<em>version</em>-installer-<em>os</em>.sh
+$ ./bazel-<em>version</em>-installer-<em>os</em>.sh --user
+</pre>
+
+The `--user` flag installs Bazel to the `$HOME/bin` directory on your system and
+sets the `.bazelrc` path to `$HOME/.bazelrc`. Use the `--help` command to see
+additional installation options.
+
+### 5. Set up your environment
+
+If you ran the Bazel installer with the `--user` flag as above, the Bazel
+executable is installed in your `$HOME/bin` directory. It's a good idea to add
+this directory to your default paths, as follows:
+
+```bash
+$ export PATH="$PATH:$HOME/bin"
+```
+
+You can also add this command to your `~/.bashrc` file.
+
+You are all set. You can confirm Bazel is installed successfully by running
+`bazel version`.
diff --git a/site/versions/master/docs/install-ubuntu.md b/site/versions/master/docs/install-ubuntu.md
new file mode 100644
index 0000000000..3fe9ee3c04
--- /dev/null
+++ b/site/versions/master/docs/install-ubuntu.md
@@ -0,0 +1,95 @@
+--------------------------------------------------------------------------------
+
+layout: documentation
+
+## title: Installing Bazel on Ubuntu
+
+# <a name="ubuntu"></a>Install Bazel on Ubuntu
+
+Supported Ubuntu Linux platforms:
+
+*   16.04 (LTS)
+*   15.10
+
+Install Bazel on Ubuntu using one of the following methods:
+
+*   [Use our custom APT repository (recommended)](#install-on-ubuntu)
+*   [Use the binary installer](#install-with-installer-ubuntu)
+*   [Compile Bazel from source](#install-compile-source.md)
+
+Bazel comes with two completion scripts. After installing Bazel, you can:
+
+*   access the [bash completion script](install.md)
+*   install the [zsh completion script](install.md)
+
+## <a name="install-on-ubuntu"></a> Using Bazel custom APT repository (recommended)
+
+### 1. Add Bazel distribution URI as a package source (one time setup)
+
+```
+$ echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
+$ curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
+```
+
+If you want to use the JDK 7, please replace `jdk1.8` with `jdk1.7` and if you
+want to install the testing version of Bazel, replace `stable` with `testing`.
+
+### 2. Install and update Bazel
+
+`$ sudo apt-get update && sudo apt-get install bazel`
+
+Once installed, you can upgrade to newer version of Bazel with:
+
+`$ sudo apt-get upgrade bazel`
+
+## <a name="install-with-installer-ubuntu"></a>Install with installer
+
+We provide binary installers on our
+<a href="https://github.com/bazelbuild/bazel/releases">GitHub releases page</a>
+
+The installer only contains Bazel binary, some additional libraries are required
+to be installed on the machine to work.
+
+### 1. Install JDK 8
+
+To install OpenJDK 8:
+
+```
+$ sudo apt-get install openjdk-8-jdk
+```
+
+### 2. Install other required packages
+
+```
+$ sudo apt-get install pkg-config zip g++ zlib1g-dev unzip
+```
+
+### 3. Download Bazel
+
+Download the [Bazel installer](https://github.com/bazelbuild/bazel/releases) for
+your operating system.
+
+### 4. Run the installer
+
+Run the installer:
+
+<pre>
+$ chmod +x bazel-<em>version</em>-installer-<em>os</em>.sh
+$ ./bazel-<em>version</em>-installer-<em>os</em>.sh --user
+</pre>
+
+The `--user` flag installs Bazel to the `$HOME/bin` directory on your system and
+sets the `.bazelrc` path to `$HOME/.bazelrc`. Use the `--help` command to see
+additional installation options.
+
+### 5. Set up your environment
+
+If you ran the Bazel installer with the `--user` flag as above, the Bazel
+executable is installed in your `$HOME/bin` directory. It's a good idea to add
+this directory to your default paths, as follows:
+
+```bash
+$ export PATH="$PATH:$HOME/bin"
+```
+
+You can also add this command to your `~/.bashrc` file.
diff --git a/site/versions/master/docs/install-windows.md b/site/versions/master/docs/install-windows.md
new file mode 100644
index 0000000000..af69f4053c
--- /dev/null
+++ b/site/versions/master/docs/install-windows.md
@@ -0,0 +1,46 @@
+---
+layout: documentation
+title: Installing Bazel on Windows
+---
+
+# <a name="windows"></a>Install Bazel on Windows
+
+Windows support is highly experimental. Known issues are [marked with
+label "Windows"](https://github.com/bazelbuild/bazel/issues?q=is%3Aissue+is%3Aopen+label%3A%22category%3A+multi-platform+%3E+windows%22)
+on GitHub issues.
+
+We currently support only 64 bit Windows 7 or higher and we compile Bazel as a
+MSYS2 binary.
+
+Install Bazel on Windows using one of the following methods:
+
+  * [Use Chocolatey](#install-on-windows-chocolatey)
+  * [Use the binary distribution](#download-binary-windows)
+  * [Compile Bazel from source](install-compile-source.md) -- make sure
+    your machine meets the [requirements](windows.md#requirements)
+
+
+## <a name="install-on-windows-chocolatey"></a>Install using Chocolatey
+
+You can install the unofficial package using the
+[chocolatey](https://chocolatey.org) package manager:
+
+```sh
+choco install bazel
+```
+
+This will install the latest available version of bazel, and dependencies.
+
+This package is experimental; please provide feedback to `@petemounce` in GitHub
+issue tracker. See the [Chocolatey installation and package
+maintenance](windows-chocolatey-maintenance.md) guide for more information.
+
+
+## <a name="download-binary-windows"></a>Install using the binary distribution
+
+We provide binary versions on our
+<a href="https://github.com/bazelbuild/bazel/releases">GitHub releases page</a>
+
+This is merely the Bazel binary. You'll need additional software (e.g. msys2
+shell of the right version) and some setup in your environment to run Bazel.
+See these requirements on our [Windows page](windows.md#requirements).
diff --git a/site/versions/master/docs/install.md b/site/versions/master/docs/install.md
index 87244c5f56..168aaac883 100644
--- a/site/versions/master/docs/install.md
+++ b/site/versions/master/docs/install.md
@@ -5,13 +5,13 @@ title: Installing Bazel
 
 # Installing Bazel
 
-Supported platforms:
+See the instructions for installing Bazel on:
 
-*   [Ubuntu Linux (Wily 15.10 and Trusty 14.04 LTS)](#ubuntu)
-*   [Mac OS X](#mac-os-x)
-*   [Windows (highly experimental)](#windows)
+*   [Ubuntu Linux (16.04 (LTS) and 15.10)](install-ubuntu.md)
+*   [Mac OS X](install-os-x.md)
+*   [Windows (highly experimental)](install-windows.md)
 
-For other platforms, you can try to [compile from source](#compiling-from-source).
+For other platforms, you can try to [compile from source](install-compile-source.md).
 
 Required Java version:
 
@@ -23,298 +23,8 @@ Extras:
 *   [Bash completion](#bash)
 *   [zsh completion](#zsh)
 
-For more information on using Bazel, see [Getting
-started](getting-started.html).
-
-
-## <a name="ubuntu"></a>Ubuntu
-
-Install Bazel on Ubuntu using one of the following methods:
-
-  * [Using our custom APT repository](#install-on-ubuntu)
-  * [Using binary installer](#install-with-installer-ubuntu)
-  * [Compiling Bazel from source](#compiling-from-source)
-
-### <a name="install-on-ubuntu"></a> Using Bazel custom APT repository (recommended)
-
-#### 1. Install JDK 8
-
-If you are running **Ubuntu Wily (15.10)**, you can skip this step.
-But for **Ubuntu Trusty (14.04 LTS)** users, since OpenJDK 8 is not available on Trusty, please install Oracle JDK 8:
-
-```
-$ sudo add-apt-repository ppa:webupd8team/java
-$ sudo apt-get update
-$ sudo apt-get install oracle-java8-installer
-```
-
-Note: You might need to `sudo apt-get install software-properties-common` if you don't have the `add-apt-repository` command. See [here](http://manpages.ubuntu.com/manpages/wily/man1/add-apt-repository.1.html).
-
-#### 2. Add Bazel distribution URI as a package source (one time setup)
-
-```
-$ echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
-$ curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
-```
-
-If you want to use the JDK 7, please replace `jdk1.8` with `jdk1.7` and if you want to install the testing version of Bazel, replace `stable` with `testing`.
-
-#### 3. Install and update Bazel
-
-`$ sudo apt-get update && sudo apt-get install bazel`
-
-Once installed, you can upgrade to newer version of Bazel with:
-
-`$ sudo apt-get upgrade bazel`
-
-### <a name="install-with-installer-ubuntu"></a>Install with Installer
-
-We provide binary installers on our
-<a href="https://github.com/bazelbuild/bazel/releases">GitHub releases page</a>
-
-The installer only contains Bazel binary, some additional libraries are required to be installed on the machine to work.
-
-
-#### 1. Install JDK 8
-
-**Ubuntu Trusty (14.04 LTS).** OpenJDK 8 is not available on Trusty. To
-install Oracle JDK 8:
-
-```
-$ sudo add-apt-repository ppa:webupd8team/java
-$ sudo apt-get update
-$ sudo apt-get install oracle-java8-installer
-```
-
-Note: You might need to `sudo apt-get install software-properties-common` if you don't have the `add-apt-repository` command. See [here](http://manpages.ubuntu.com/manpages/wily/man1/add-apt-repository.1.html).
-
-**Ubuntu Wily (15.10).** To install OpenJDK 8:
-
-```
-$ sudo apt-get install openjdk-8-jdk
-```
-
-#### 2. Install other required packages
-
-```
-$ sudo apt-get install pkg-config zip g++ zlib1g-dev unzip
-```
-
-#### 3. Download Bazel
-
-Download the [Bazel installer](https://github.com/bazelbuild/bazel/releases) for
-your operating system.
-
-#### 4. Run the installer
-
-Run the installer:
-
-<pre>
-$ chmod +x bazel-<em>version</em>-installer-<em>os</em>.sh
-$ ./bazel-<em>version</em>-installer-<em>os</em>.sh --user
-</pre>
-
-The `--user` flag installs Bazel to the `$HOME/bin` directory on your
-system and sets the `.bazelrc` path to `$HOME/.bazelrc`. Use the `--help`
-command to see additional installation options.
-
-#### 5. Set up your environment
-
-If you ran the Bazel installer with the `--user` flag as above, the Bazel
-executable is installed in your `$HOME/bin` directory. It's a good idea to add
-this directory to your default paths, as follows:
-
-```bash
-$ export PATH="$PATH:$HOME/bin"
-```
-
-You can also add this command to your `~/.bashrc` file.
-
-
-
-## <a name="mac-os-x"></a>Mac OS X
-
-Install Bazel on Mac OS X using one of the following methods:
-
-  * [Install using Homebrew](#install-on-mac-os-x-homebrew)
-  * [Install with installer](#install-with-installer-mac-os-x)
-  * [Compiling Bazel from source](#compiling-from-source)
-
-
-### <a name="install-on-mac-os-x-homebrew"></a>Install using Homebrew
-
-#### 1. Install JDK 8
-
-JDK 8 can be downloaded from
-[Oracle's JDK Page](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html).
-Look for "Mac OS X x64" under "Java SE Development Kit". This will download a
-DMG image with an install wizard.
-
-#### 2. Install Homebrew on Mac OS X (one time setup)
-
-`$ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`
-
-#### 3. Install Bazel Homebrew Package
-
-`$ brew install bazel`
-
-You are all set. You can confirm Bazel is installed successfully by running `bazel version`.
-
-You can later upgrade to newer version of Bazel with `brew upgrade bazel`.
-
-### <a name="install-with-installer-mac-os-x"></a>Install with installer
-
-We provide binary installers on our
-<a href="https://github.com/bazelbuild/bazel/releases">GitHub releases page</a>
-
-The installer only contains Bazel binary, some additional libraries are required to be installed on the machine to work.
-
-#### 1. Install JDK 8
-
-JDK 8 can be downloaded from
-[Oracle's JDK Page](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html).
-Look for "Mac OS X x64" under "Java SE Development Kit". This will download a
-DMG image with an install wizard.
-
-#### 2. Install XCode command line tools
-
-Xcode can be downloaded from the
-[Apple Developer Site](https://developer.apple.com/xcode/downloads/), which will
-redirect to the App Store.
-
-For `objc_*` and `ios_*` rule support, you must have Xcode 6.1 or later with
-iOS SDK 8.1 installed on your system.
-
-Once XCode is installed you can trigger signing the license with the following
-command:
-
-```
-$ sudo gcc --version
-```
-
-#### 3. Download Bazel
-
-Download the [Bazel installer](https://github.com/bazelbuild/bazel/releases) for
-your operating system.
-
-#### 4. Run the installer
-
-Run the installer:
-
-<pre>
-$ chmod +x bazel-<em>version</em>-installer-<em>os</em>.sh
-$ ./bazel-<em>version</em>-installer-<em>os</em>.sh --user
-</pre>
-
-The `--user` flag installs Bazel to the `$HOME/bin` directory on your
-system and sets the `.bazelrc` path to `$HOME/.bazelrc`. Use the `--help`
-command to see additional installation options.
-
-#### 5. Set up your environment
-
-If you ran the Bazel installer with the `--user` flag as above, the Bazel
-executable is installed in your `$HOME/bin` directory. It's a good idea to add
-this directory to your default paths, as follows:
-
-```bash
-$ export PATH="$PATH:$HOME/bin"
-```
-
-You can also add this command to your `~/.bashrc` file.
-
-You are all set. You can confirm Bazel is installed successfully by running `bazel version`.
-
-## <a name="windows"></a>Windows
-
-Windows support is highly experimental. Known issues are [marked with
-label "Windows"](https://github.com/bazelbuild/bazel/issues?q=is%3Aissue+is%3Aopen+label%3A%22category%3A+multi-platform+%3E+windows%22)
-on GitHub issues.
-
-We currently support only 64 bit Windows 7 or higher and we compile Bazel as a
-MSYS2 binary.
-
-Install Bazel on Windows using one of the following methods:
-
-  * [Using Chocolatey](#install-on-windows-chocolatey)
-  * [Using binary distribution](#download-binary-windows)
-  * [Compiling Bazel from source](#compiling-from-source) -- make sure
-    your machine meets the [requirements](windows.md#requirements)
-
-
-### <a name="install-on-windows-chocolatey"></a>Install on Windows using Chocolatey
-
-You can install the unofficial package using the
-[chocolatey](https://chocolatey.org) package manager:
-
-```sh
-choco install bazel
-```
-
-This will install the latest available version of bazel, and dependencies.
-
-This package is experimental; please provide feedback to `@petemounce` in GitHub
-issue tracker. See the [Chocolatey installation and package
-maintenance](windows-chocolatey-maintenance.md) guide for more information.
-
-
-### <a name="download-binary-windows"></a>Download a precompiled binary
-
-We provide binary versions on our
-<a href="https://github.com/bazelbuild/bazel/releases">GitHub releases page</a>
-
-This is merely the Bazel binary. You'll need additional software (e.g. msys2
-shell of the right version) and some setup in your environment to run Bazel.
-See these requirements on our [Windows page](windows.md#requirements).
-
-
-## <a name="compiling-from-source"></a>Compiling from source
-
-The standard way of compiling a release version of Bazel from source
-is to use a distribution archive. Download `bazel-<VERSION>-dist.zip`
-from
-the [release page](https://github.com/bazelbuild/bazel/releases) for
-the desired version. We recommend to also verify the signature made by our
-[release key](https://bazel.build/bazel-release.pub.gpg) 48457EE0.
-
-Unzip the archive and call `bash ./compile.sh`; this will create a
-bazel binary in `output/bazel`. This binary is self-contained,
-so it can be copied to a directory on the PATH (e.g.,
-`/usr/local/bin`) or used in-place.
-
-###<a name="compiling-from-source-issues"></a>Known issues when compiling from source
-
-**On Windows:**
-
-* version 0.4.4 and below: `compile.sh` may fail right after start with an error
-  like this:
-
-    ```
-    File not found - *.jar
-    no error prone jar
-    ```
-
-    Workaround is to run this (and add it to your `~/.bashrc`):
-
-    ```
-    export PATH="/bin:/usr/bin:$PATH"
-    ```
-
-* version 0.4.3 and below: `compile.sh` may fail fairly early with many Java
-  compilation errors. The errors look similar to:
-
-    ```
-    C:\...\bazel_VR1HFY7x\src\com\google\devtools\build\lib\remote\ExecuteServiceGrpc.java:11: error: package io.grpc.stub does not exist
-    import static io.grpc.stub.ServerCalls.asyncUnaryCall;
-                              ^
-    ```
-
-    This is caused by a bug in one of the bootstrap scripts
-    (`scripts/bootstrap/compile.sh`). Manually apply this one-line fix if you want
-    to build Bazel purely from source (without using an existing Bazel binary):
-    [5402993a5e9065984a42eca2132ec56ca3aa456f]( https://github.com/bazelbuild/bazel/commit/5402993a5e9065984a42eca2132ec56ca3aa456f).
-
-* version 0.3.2 and below:
-  [github issue #1919](https://github.com/bazelbuild/bazel/issues/1919)
+For more information on using Bazel, see
+[Getting Started with Bazel](getting-started.html).
 
 
 ## <a name="jdk7"></a>Using Bazel with JDK 7 (deprecated)
diff --git a/site/versions/master/docs/windows.md b/site/versions/master/docs/windows.md
index c9f595d308..86470f6c9d 100644
--- a/site/versions/master/docs/windows.md
+++ b/site/versions/master/docs/windows.md
@@ -3,8 +3,9 @@ layout: documentation
 title: Windows
 ---
 
+# Using Bazel on Windows
 
-Windows support is highly experimental. Known issues are [marked with label
+Windows support is experimental. Known issues are [marked with label
 "Windows"](https://github.com/bazelbuild/bazel/issues?q=is%3Aissue+is%3Aopen+label%3A%22category%3A+multi-platform+%3E+windows%22)
 on github issues.
 
@@ -13,8 +14,7 @@ msys2 binary.
 
 ## <a name="install"></a>Installation
 
-See instructions on the [installation page](install.md#windows).
-
+See instructions on the [installation page](install-windows.md).
 
 ## <a name="requirements"></a>Requirements