Global cleanup change.

--
MOS_MIGRATED_REVID=137494506

20 files changed, 77 insertions, 77 deletions

diff --git a/site/CNAME b/site/CNAME
index 8eb5b1677a..23ffbc5dc0 100644
--- a/site/CNAME
+++ b/site/CNAME
@@ -1 +1 @@
-bazel.io
+bazel.build
diff --git a/site/blog/_posts/2015-04-15-share-your-project.md b/site/blog/_posts/2015-04-15-share-your-project.md
index d937b6deb7..49ffa2f5db 100644
--- a/site/blog/_posts/2015-04-15-share-your-project.md
+++ b/site/blog/_posts/2015-04-15-share-your-project.md
@@ -4,7 +4,7 @@ title: Tell us about your Bazel project!
 ---
 
 We're setting up a list of projects using Bazel. If you'd like us
-to list your project on [bazel.io](http://bazel.io),
+to list your project on [bazel.build](http://bazel.build),
 [send us](https://groups.google.com/d/msg/bazel-discuss/5XaCYQOdN8o/DHE9H4ygHiYJ)
 the following information:
 
diff --git a/site/blog/_posts/2015-06-17-visualize-your-build.md b/site/blog/_posts/2015-06-17-visualize-your-build.md
index 0bd20e1aa1..fc37e879d0 100644
--- a/site/blog/_posts/2015-06-17-visualize-your-build.md
+++ b/site/blog/_posts/2015-06-17-visualize-your-build.md
@@ -20,7 +20,7 @@ $ cd tiny-workspace
 ```
 
 Make sure you've
-[downloaded and installed Bazel](http://bazel.io/docs/install.html) and have the
+[downloaded and installed Bazel](http://bazel.build/docs/install.html) and have the
 following line to your _~/.bazelrc_:
 
 ```
diff --git a/site/blog/_posts/2015-07-01-Configuration-File.md b/site/blog/_posts/2015-07-01-Configuration-File.md
index 037096b1ce..b969141021 100644
--- a/site/blog/_posts/2015-07-01-Configuration-File.md
+++ b/site/blog/_posts/2015-07-01-Configuration-File.md
@@ -24,4 +24,4 @@ three paths to master rc files that are read in the following order:
   2. `/path/to/bazel.bazelrc` (alongside bazel rc file), and
   3. `/etc/bazel.bazelrc` (system-wide bazel rc file).
 
-The complete documentation on rc file is [here](http://bazel.io/docs/bazel-user-manual.html#bazelrc).
+The complete documentation on rc file is [here](http://bazel.build/docs/bazel-user-manual.html#bazelrc).
diff --git a/site/blog/_posts/2015-07-28-docker_build.md b/site/blog/_posts/2015-07-28-docker_build.md
index 49cb5a00c6..121261f58f 100644
--- a/site/blog/_posts/2015-07-28-docker_build.md
+++ b/site/blog/_posts/2015-07-28-docker_build.md
@@ -59,7 +59,7 @@ ADD bazinga /
 VOLUMES /asdf
 ```
 
-Using [remote repositories](http://bazel.io/docs/external.html), it is possible
+Using [remote repositories](http://bazel.build/docs/external.html), it is possible
 to fetch the various base image for the web and we are working on providing a
 `docker_pull` rule to interact more fluently with existing images.
 
diff --git a/site/blog/_posts/2015-09-01-beta-release.md b/site/blog/_posts/2015-09-01-beta-release.md
index 46278045a9..67bbcf2040 100644
--- a/site/blog/_posts/2015-09-01-beta-release.md
+++ b/site/blog/_posts/2015-09-01-beta-release.md
@@ -5,7 +5,7 @@ title: Bazel Builder Blasts Beyond Beta Barrier
 
 _Reposted from [Google's Open Source blog](http://google-opensource.blogspot.com/2015/09/building-build-system-bazel-reaches-beta.html)._
 
-We're excited to announce the Beta release of [Bazel](http://bazel.io), an [open
+We're excited to announce the Beta release of [Bazel](http://bazel.build), an [open
 source](https://github.com/bazelbuild/bazel) build system designed to support a
 wide variety of different programming languages and platforms.
 
@@ -24,20 +24,20 @@ Our beta release provides:
 * Binary releases for
   [Linux and OS X](https://github.com/bazelbuild/bazel/releases).
 * Support for building and testing C++, Java, Python, Rust,
-  [and more](http://bazel.io/docs/be/overview.html).
+  [and more](http://bazel.build/docs/be/overview.html).
 * Support for building Docker images, Android apps, and iOS apps.
 * Support for using libraries from
-  [Maven, GitHub, and more](http://bazel.io/docs/external.html).
-* [A robust API](http://bazel.io/docs/skylark/index.html) for adding your own
+  [Maven, GitHub, and more](http://bazel.build/docs/external.html).
+* [A robust API](http://bazel.build/docs/skylark/index.html) for adding your own
   build rules.
 
-Check out the [tutorial app](http://bazel.io/docs/tutorial/index.html) to see a
+Check out the [tutorial app](http://bazel.build/docs/tutorial/index.html) to see a
 working example using several languages.
 
 We still have a long way to go.  Looking ahead towards our 1.0.0 release, we
 plan to provide Windows support, distributed caching, and Go support among other
-features. See our [roadmap](http://bazel.io/roadmap.html) for more details
-and follow our [blog](http://bazel.io/blog) or
+features. See our [roadmap](http://bazel.build/roadmap.html) for more details
+and follow our [blog](http://bazel.build/blog) or
 [Twitter](https://twitter.com/bazelbuild) account for regular updates.  Feel
 free to contact us with questions or feedback on the
 [mailing list](https://groups.google.com/forum/#!forum/bazel-discuss) or IRC
diff --git a/site/blog/_posts/2016-01-27-continuous-integration.md b/site/blog/_posts/2016-01-27-continuous-integration.md
index 130e0d5a41..b843a17d01 100644
--- a/site/blog/_posts/2016-01-27-continuous-integration.md
+++ b/site/blog/_posts/2016-01-27-continuous-integration.md
@@ -13,19 +13,19 @@ build.
 
 ## Running Bazel on virtual or physical machines.
 
-For [ci.bazel.io](http://ci.bazel.io), we use
+For [ci.bazel.build](http://ci.bazel.build), we use
 [Google Compute Engine](https://cloud.google.com/compute/) virtual machine for
 our Linux build and a physical Mac mini for our Mac build. Apart from Bazel
 tests that are run using the
 [`./compile.sh`](https://github.com/bazelbuild/bazel/blob/master/compile.sh)
 script, we also run some projects to validate Bazel binaries against: the
 [Bazel Tutorial](https://github.com/bazelbuild/examples/tree/master/tutorial)
-[here](http://ci.bazel.io/job/Tutorial/),
-[re2](https://github.com/google/re2) [here](http://ci.bazel.io/job/re2/),
+[here](http://ci.bazel.build/job/Tutorial/),
+[re2](https://github.com/google/re2) [here](http://ci.bazel.build/job/re2/),
 [protobuf](https://github.com/google/protobuf)
-[here](http://ci.bazel.io/job/protobuf/), and
+[here](http://ci.bazel.build/job/protobuf/), and
 [TensorFlow](https://www.tensorflow.org)
-[here](http://ci.bazel.io/job/TensorFlow/).
+[here](http://ci.bazel.build/job/TensorFlow/).
 
 Bazel is reinstalled each time we run the tutorial or TensorFlow, but the Bazel
 cache is maintained across installs. The setup for those jobs is the following:
@@ -64,7 +64,7 @@ has some feature that are incompatibles with Docker:
   you cannot mount the socket inside the Docker container, then you must disable
   client-server communication by running Bazel in batch mode with the `--batch`
   flag.
-- Bazel [sandboxes all actions on linux by default](http://bazel.io/blog/2015/09/11/sandboxing.html)
+- Bazel [sandboxes all actions on linux by default](http://bazel.build/blog/2015/09/11/sandboxing.html)
   and this needs special privileges in the Docker container (enabled by
   [`--privilege=true`](https://docs.docker.com/engine/reference/run/#runtime-privilege-linux-capabilities-and-lxc-configuration).
   If you cannot enable the namespace sandbox, you can deactivate it in Bazel
@@ -137,11 +137,11 @@ using `test` and `build` commands:
 </table>
 
 These return codes can be used to determine the reason for a failure
-(in [ci.bazel.io](http://ci.bazel.io), we mark builds that have exited with exit
+(in [ci.bazel.build](http://ci.bazel.build), we mark builds that have exited with exit
 code 3 as unstable, and other non zero code as failed).
 
 You can also control how much information about test results Bazel prints out
-with the [`--test_output` flag](http://bazel.io/docs/bazel-user-manual.html#flag--test_output).
+with the [`--test_output` flag](http://bazel.build/docs/bazel-user-manual.html#flag--test_output).
 Generally, printing the output of test that fails with `--test_output=errors` is
 a good setting for a CI system.
 
@@ -153,6 +153,6 @@ Other tests also get [a basic XML output file](https://github.com/bazelbuild/baz
 that contains only the result of the test (success or failure).
 
 To get your test results, you can also use the
-[Bazel dashboard](http://bazel.io/blog/2015/07/29/dashboard-dogfood.html),
+[Bazel dashboard](http://bazel.build/blog/2015/07/29/dashboard-dogfood.html),
 an optional system that automatically uploads Bazel test results to a shared
 server.
diff --git a/site/blog/_posts/2016-02-23-0.2.0-release.md b/site/blog/_posts/2016-02-23-0.2.0-release.md
index c643358e5e..bc40805b3c 100644
--- a/site/blog/_posts/2016-02-23-0.2.0-release.md
+++ b/site/blog/_posts/2016-02-23-0.2.0-release.md
@@ -9,7 +9,7 @@ Bazel. This release marks major improvements in support for external
 repositories, Skylark and testing, in particular how external repositories and
 Skylark can work together.
 
-## Improvements from our [roadmap](http://bazel.io/roadmap.html)
+## Improvements from our [roadmap](http://bazel.build/roadmap.html)
 
 ### Skylark rules can now be loaded from remote repositories
 
@@ -42,7 +42,7 @@ list](https://groups.google.com/forum/#!forum/bazel-discuss).
 ### Go build and test support
 
 There is now Go language support, see [the
-documentation](http://bazel.io/docs/be/go.html) for details.
+documentation](http://bazel.build/docs/be/go.html) for details.
 
 ### Open sourcing tests
 
diff --git a/site/blog/_posts/2016-03-18-sandbox-easier-debug.md b/site/blog/_posts/2016-03-18-sandbox-easier-debug.md
index 9390cdd91c..64f6841488 100644
--- a/site/blog/_posts/2016-03-18-sandbox-easier-debug.md
+++ b/site/blog/_posts/2016-03-18-sandbox-easier-debug.md
@@ -6,7 +6,7 @@ title: Easier Debugging of Sandbox Failures
 We have often heard that debugging failed execution due to issues with the sandbox is difficult and requires knowledge of the sandboxing code of Bazel to actually understand what’s happening. With [these changes](https://github.com/bazelbuild/bazel/commit/40ee9de052e3bb8cf5a59eeff3936148e1f55e69), we hope that you will be able to solve common issues easier on your own and make debugging easier.
 
 
-If you don’t know much about Bazel sandbox, you might want to read [this blog post](http://bazel.io/blog/2015/09/11/sandboxing.html)
+If you don’t know much about Bazel sandbox, you might want to read [this blog post](http://bazel.build/blog/2015/09/11/sandboxing.html)
 
 
 ## What we did:
diff --git a/site/blog/_posts/2016-06-10-0.3.0-release.md b/site/blog/_posts/2016-06-10-0.3.0-release.md
index 0da207e0e6..d8a97c3a71 100644
--- a/site/blog/_posts/2016-06-10-0.3.0-release.md
+++ b/site/blog/_posts/2016-06-10-0.3.0-release.md
@@ -9,18 +9,18 @@ Bazel. This milestone is marked by support for IDE integration but also major
 features such as remote caching of build artifacts and experimental Windows
 support.
 
-## Improvements from our [roadmap](http://bazel.io/roadmap.html)
+## Improvements from our [roadmap](http://bazel.build/roadmap.html)
 
 ### IDE support
 
 In this release, we made it possible to [generate information for IDEs from
-Bazel build files](http://bazel.io/blog/2016/06/10/ide-support.html) using
-[Skylark aspects](http://bazel.io/docs/skylark/aspects.html).
+Bazel build files](http://bazel.build/blog/2016/06/10/ide-support.html) using
+[Skylark aspects](http://bazel.build/docs/skylark/aspects.html).
 
 Simultaneous with Bazel 0.3 release, we are announcing the availability of two
 projects integrating Bazel with different IDEs:
 
-* [Tulsi](http://tulsi.bazel.io) is an Xcode plugin for Bazel. This is the same
+* [Tulsi](http://tulsi.bazel.build) is an Xcode plugin for Bazel. This is the same
   plugin that teams inside Google use for developing iOS applications.
 * [e4b](https://github.com/bazelbuild/e4b) is an experimental Eclipse plugin for
   Bazel. It was made to illustrate the use of Skylark aspects for IDE
@@ -29,7 +29,7 @@ projects integrating Bazel with different IDEs:
 
 ### Windows support
 
-Bazel can now bootstrap on [Windows](http://bazel.io/docs/windows.html) without
+Bazel can now bootstrap on [Windows](http://bazel.build/docs/windows.html) without
 admin privilege and can use the Microsoft Visual C++ toolchain. Windows
 support is still highly experimental and we have identified
 [several issues](https://github.com/bazelbuild/bazel/issues?q=is%3Aissue+is%3Aopen+label%3A%22category%3A+multi-platform+%3E+windows%22)
@@ -46,16 +46,16 @@ with Alpha to enhance that support.
 ### Skylark remote repositories
 
 Remote repository rules can now be created using
-[Skylark](http://bazel.io/docs/skylark/repository_rules.html). This can be used
+[Skylark](http://bazel.build/docs/skylark/repository_rules.html). This can be used
 to support your custom protocols, interfacing with new packaging systems or even
 do auto-configuration to use a toolchain on your local disk. We use it
-especially to have [a better out-of-the-box experience with C++ toolchains](http://www.bazel.io/blog/2016/03/31/autoconfiguration.html).
+especially to have [a better out-of-the-box experience with C++ toolchains](http://www.bazel.build/blog/2016/03/31/autoconfiguration.html).
 
 ## Other major changes since 0.2.0
 
 * We just open-sourced our BUILD file formatter, [buildifier](https://github.com/bazelbuild/buildifier).
 * We now provide a Debian APT repository for installing bazel, see the
-  [installation guide](http://bazel.io/docs/install.html) on how to use it.
+  [installation guide](http://bazel.build/docs/install.html) on how to use it.
 * Our JUnit test runner for Java tests (`--nolegacy_bazel_java_test`) is now the
   default.
 
@@ -68,7 +68,7 @@ changes.
 Looking ahead to 0.4.0:
 
 * The last blockers for `--strategy=worker=Javac` will be resolved, making Java
-  builds [faster](http://www.bazel.io/blog/2015/12/10/java-workers.html).
+  builds [faster](http://www.bazel.build/blog/2015/12/10/java-workers.html).
 * [Yue](https://github.com/hermione521) has made great progress in making
   [Ulf](https://github.com/ulfjack)'s prototype of [sandboxing for OS
   X](https://github.com/bazelbuild/bazel/tree/osx-sandbox-hardlinks) real.
diff --git a/site/blog/_posts/2016-06-10-ide-support.md b/site/blog/_posts/2016-06-10-ide-support.md
index 6d0f7cc881..34b7d6a6bb 100644
--- a/site/blog/_posts/2016-06-10-ide-support.md
+++ b/site/blog/_posts/2016-06-10-ide-support.md
@@ -8,7 +8,7 @@ With the 0.3 release, we finally have all machinery in place that allows
 implementing integration with Bazel in IDEs. Simultaneous with that
 Bazel release we are also making public two IDE plugins:
 
-*   [Tulsi](http://tulsi.bazel.io): Bazel support for Xcode.
+*   [Tulsi](http://tulsi.bazel.build): Bazel support for Xcode.
 *   [e4b](https://github.com/bazelbuild/e4b): a sample Bazel plugin for Eclipse.
 
 In this post, we will look into how Bazel enables IDE integration
diff --git a/site/blog/_posts/2016-10-20-intellij-support.md b/site/blog/_posts/2016-10-20-intellij-support.md
index 6bd7a6a423..4f95745224 100644
--- a/site/blog/_posts/2016-10-20-intellij-support.md
+++ b/site/blog/_posts/2016-10-20-intellij-support.md
@@ -4,7 +4,7 @@ title: IntelliJ and Android Studio support
 ---
 
 We've recently open-sourced Bazel plugins for
-[IntelliJ and Android Studio](https://ij.bazel.io).
+[IntelliJ and Android Studio](https://ij.bazel.build).
 
 ## Key Features ##
 
@@ -25,6 +25,6 @@ To try them out, you can install them directly from within the IDE
 JetBrains [plugin repository](https://plugins.jetbrains.com/search/index?search=bazel),
 or build directly from [source](https://github.com/bazelbuild/intellij).
 
-Detailed docs are available [here](https://ij.bazel.io).
+Detailed docs are available [here](https://ij.bazel.build).
 
 The plugins are currently Linux-only, with plans for Mac support in the future.
diff --git a/site/contributing.md b/site/contributing.md
index 4e84abe65d..8087d5059b 100644
--- a/site/contributing.md
+++ b/site/contributing.md
@@ -56,7 +56,7 @@ for Java. We don't have IDE support for other languages in Bazel right now.
 ### Creating an IntelliJ project
 
 To work with IntelliJ, follow the instructions at
-[ij.bazel.io](https://ij.bazel.io).
+[ij.bazel.build](https://ij.bazel.build).
 
 ### Creating an Eclipse project
 
@@ -121,7 +121,7 @@ But if you want to debug the Java code, you must attach to the server using the
   [remote Java application launch
   configuration](http://help.eclipse.org/luna/index.jsp?topic=%2Forg.eclipse.jdt.doc.user%2Ftasks%2Ftask-remotejava_launch_config.htm).
 * Our IntelliJ plugin has built-in
-  [debugging support](https://ij.bazel.io/docs/run-configurations.html)
+  [debugging support](https://ij.bazel.build/docs/run-configurations.html)
 
 ## Bazel's code description
 
diff --git a/site/designs/_posts/2016-02-16-cpp-autoconf.md b/site/designs/_posts/2016-02-16-cpp-autoconf.md
index c80fc8cb62..650efd9ec8 100644
--- a/site/designs/_posts/2016-02-16-cpp-autoconf.md
+++ b/site/designs/_posts/2016-02-16-cpp-autoconf.md
@@ -131,7 +131,7 @@ To ease the writing of crosstool, we should also provide a
 `template(path, label, variables)` method which will write the file
 pointed by path using the file pointed by label (should be a
 FileValue) in which variables have been replaced in the same way that
-[template_action](http://bazel.io/docs/skylark/lib/ctx.html#template_action)
+[template_action](http://bazel.build/docs/skylark/lib/ctx.html#template_action)
 works.
 
 ## Rollout plan
diff --git a/site/designs/_posts/2016-05-23-beautiful-error-messages.md b/site/designs/_posts/2016-05-23-beautiful-error-messages.md
index dd8d0e569a..6f1852d8af 100644
--- a/site/designs/_posts/2016-05-23-beautiful-error-messages.md
+++ b/site/designs/_posts/2016-05-23-beautiful-error-messages.md
@@ -84,7 +84,7 @@ Suggested:
 <pre><code>ERROR: /path/BUILD:6:16: <strong>my\_obj of type 'select' is not iterable.</strong> You can iterate only on string, lists, tuples, or dicts.
 t = [x for x in my\_obj]
                 ^-----
-Related documentation: http://www.bazel.io/docs/be/functions.html#select
+Related documentation: http://www.bazel.build/docs/be/functions.html#select
 </code></pre>
 
 ***
@@ -115,7 +115,7 @@ Suggested:
 glob(["*.cc"], excludes = ["foo.cc"])
                ^-------
                exclude
-Related documentation: http://www.bazel.io/docs/be/functions.html#glob
+Related documentation: http://www.bazel.build/docs/be/functions.html#glob
 </code></pre>
 
 ***
@@ -149,7 +149,7 @@ Suggested:
     deps = ":lib",
            ^-----
            [":lib"]
-Related documentation: http://www.bazel.io/docs/be/c-cpp.html#cc\_library
+Related documentation: http://www.bazel.build/docs/be/c-cpp.html#cc\_library
 </code></pre>
 
 ***
@@ -169,7 +169,7 @@ Suggested:
     deps = VAR,
            ^--
           [VAR]
-Related documentation: http://www.bazel.io/docs/be/c-cpp.html#cc\_library
+Related documentation: http://www.bazel.build/docs/be/c-cpp.html#cc\_library
 </code></pre>
 
 ***
@@ -188,7 +188,7 @@ Suggested:
     deps = ["/test:foo.cc"],
             ^-------------
             "//test:foo.cc"
-Related documentation: http://www.bazel.io/docs/build-ref.html#labels
+Related documentation: http://www.bazel.build/docs/build-ref.html#labels
 </code></pre>
 
 ***
@@ -209,7 +209,7 @@ Current:
 </code></pre>
 Suggested:
 <pre><code>ERROR: /path/BUILD:3:12: <strong>In srcs attribute of //test:name (cc\_library), '//test:x' does not produce any cc\_library srcs files</strong> (expected extension .cc, .cpp, .cxx, .c++, .C, .c, .h, .hh, .hpp, .hxx, .inc, .S, .s, .asm, .a, .pic.a, .lo, .pic.lo, .so, .dylib, .o or .pic.o). <strong>Target //test:x (genrule) generated 'file.ext'</strong>.
-Related documentation: http://www.bazel.io/docs/be/c-cpp.html#cc\_library
+Related documentation: http://www.bazel.build/docs/be/c-cpp.html#cc\_library
 </code></pre>
 
 ***
@@ -227,7 +227,7 @@ Suggested:
 <pre><code>ERROR: /path/BUILD:3:5: <strong>In deps attribute of //test:name (cc\_library), '//base:scheduling\_domain-test' (cc\_library) is marked as testonly.</strong> You may either add:
     testonly = 1
 to //test:name definition, or remove testonly from //base:scheduling\_domain-test, or remove the dependency.
-Related documentation: http://www.bazel.io/docs/be/common-definitions.html#common.testonly
+Related documentation: http://www.bazel.build/docs/be/common-definitions.html#common.testonly
 </code></pre>
 
 ***
@@ -244,7 +244,7 @@ Current:
 Suggested:
 <pre><code>ERROR: /path/BUILD:3:5: <strong>In srcs attribute of //test:name (cc\_library), '//base:arena.cc' (file) is not visible.</strong> You may change the visibility of the file using exports\_file, or expose the file via a library rule, or remove the dependency.
 //base:arena.cc has currently private visibility.
-Related documentation: http://www.bazel.io/docs/be/common-definitions.html#common.visibility
+Related documentation: http://www.bazel.build/docs/be/common-definitions.html#common.visibility
 </code></pre>
 
 ***
diff --git a/site/designs/_posts/2016-06-02-sandboxing.md b/site/designs/_posts/2016-06-02-sandboxing.md
index 99c9598575..579bd11b11 100644
--- a/site/designs/_posts/2016-06-02-sandboxing.md
+++ b/site/designs/_posts/2016-06-02-sandboxing.md
@@ -115,7 +115,7 @@ included in the environment of a Spawn is:
    (as we currently do).
  * If a rule declares its need for an environment variable, take it.
    * We already have an [“env” attribute in Skylark actions]
-     (http://www.bazel.io/docs/skylark/lib/ctx.html#action) that allows one to
+     (http://www.bazel.build/docs/skylark/lib/ctx.html#action) that allows one to
      set variables to hard-coded strings, we have `use_default_shell_env` in
      Skylark actions, which pulls in `PATH` and `TMPDIR`, but we don't have any
      way to just say "This rule needs this environment variable". Laurent
diff --git a/site/designs/_posts/2016-08-04-extensibility-for-native-rules.md b/site/designs/_posts/2016-08-04-extensibility-for-native-rules.md
index 7a70b17c1c..2b1c258587 100644
--- a/site/designs/_posts/2016-08-04-extensibility-for-native-rules.md
+++ b/site/designs/_posts/2016-08-04-extensibility-for-native-rules.md
@@ -89,7 +89,7 @@ native rule implementation (lang.java.compile) both consumes the entire
 providers from dependencies and returns the provider that needs to be returned
 from the rule. `lang.java.transitive` is a function that passes all the
 transitive information correctly from dependencies. The [existing '.java'
-provider](http://www.bazel.io/docs/skylark/lib/JavaSkylarkApiProvider.html)
+provider](http://www.bazel.build/docs/skylark/lib/JavaSkylarkApiProvider.html)
 becomes the same thing as lang.java.provider.
 
 Note: for the sake for this document we are placing things in lang.java. There
diff --git a/site/designs/_posts/2016-09-05-build-python-on-windows.md b/site/designs/_posts/2016-09-05-build-python-on-windows.md
index b60668becf..9018da50d6 100644
--- a/site/designs/_posts/2016-09-05-build-python-on-windows.md
+++ b/site/designs/_posts/2016-09-05-build-python-on-windows.md
@@ -30,7 +30,7 @@ experimental on Windows.
 
 ## Problem
 
-Currently, as described on [bazel.io](/docs/be/python.html#py_binary),
+Currently, as described on [bazel.build](/docs/be/python.html#py_binary),
 the way py\_binary works on Unix is:
 
 _A py\_binary is an executable Python program consisting of a collection
diff --git a/site/faq.md b/site/faq.md
index 3df6033f26..b431992e69 100644
--- a/site/faq.md
+++ b/site/faq.md
@@ -189,7 +189,7 @@ example, Bazel uses symlinks extensively, which has varying levels of support
 across Windows versions.
 
 We are currently actively working on improving Windows support. See
-our [blog post](https://bazel.io/blog/2016/09/07/bazel-windows.html)
+our [blog post](https://bazel.build/blog/2016/09/07/bazel-windows.html)
 for more information.
 
 What should I not use Bazel for?
@@ -267,7 +267,7 @@ Can I build Docker images with Bazel?
 -------------------------------------
 
 Yes, you can use our
-[Docker rules](http://bazel.io/docs/be/docker.html)
+[Docker rules](http://bazel.build/docs/be/docker.html)
 to build reproducible Docker images.
 
 Will Bazel make my builds reproducible automatically?
@@ -296,19 +296,19 @@ Do you have binary releases?
 
 Yes, you can find the latest release binaries
 [here](https://github.com/bazelbuild/bazel/releases/latest). Our release
-policy is documented [here](http://bazel.io/support.html).
+policy is documented [here](http://bazel.build/support.html).
 
 I use Eclipse/IntelliJ/XCode. How does Bazel interoperate with IDEs?
 --------------------------------------------------------------------
 
-For IntelliJ, check out the [IntelliJ with Bazel plugin](https://ij.bazel.io).
+For IntelliJ, check out the [IntelliJ with Bazel plugin](https://ij.bazel.build).
 
-For XCode, check out [Tulsi](http://tulsi.bazel.io/).
+For XCode, check out [Tulsi](http://tulsi.bazel.build/).
 
 For Eclipse, check out [E4B plugin](https://github.com/bazelbuild/e4b).
 
 For other IDEs, check out the [blog
-post](https://bazel.io/blog/2016/06/10/ide-support.html) on how these
+post](https://bazel.build/blog/2016/06/10/ide-support.html) on how these
 plugins work.
 
 I use Jenkins/CircleCI/TravisCI. How does Bazel interoperate with CI systems?
diff --git a/site/roadmap.md b/site/roadmap.md
index 3b1f39dc9f..f4623ee66f 100644
--- a/site/roadmap.md
+++ b/site/roadmap.md
@@ -62,15 +62,15 @@ be refined if appropriate.
       <td rowspan="9"><b>2015&#8209;03&#8209;24</b></td>
       <td>Linux &amp; OS X Support</td>
     </tr>
-    <tr><td>C++ (<a href="http://bazel.io/docs/be/c-cpp.html#cc_binary">build</a> and <a href="http://bazel.io/docs/be/c-cpp.html#cc_test">test</a>)</td></tr>
-    <tr><td>Java (<a href="http://bazel.io/docs/be/java.html#java_binary">build</a> and <a href="http://bazel.io/docs/be/java.html#java_test">test</a>)</td></tr>
-    <tr><td>Objective-C for iOS (<a href="http://bazel.io/docs/be/objective-c.html#objc_binary">build</a>)</td></tr>
-    <tr><td>Python (<a href="http://bazel.io/docs/be/python.html#py_binary">build</a>)</td></tr>
-    <tr><td>iOS applications (<a href="http://bazel.io/docs/be/objective-c.html#ios_application">build</a>)</td></tr>
-    <tr><td>Skylark extension mechanism (<a href="http://bazel.io/docs/skylark/index.html">build</a>)</td></tr>
+    <tr><td>C++ (<a href="http://bazel.build/docs/be/c-cpp.html#cc_binary">build</a> and <a href="http://bazel.build/docs/be/c-cpp.html#cc_test">test</a>)</td></tr>
+    <tr><td>Java (<a href="http://bazel.build/docs/be/java.html#java_binary">build</a> and <a href="http://bazel.build/docs/be/java.html#java_test">test</a>)</td></tr>
+    <tr><td>Objective-C for iOS (<a href="http://bazel.build/docs/be/objective-c.html#objc_binary">build</a>)</td></tr>
+    <tr><td>Python (<a href="http://bazel.build/docs/be/python.html#py_binary">build</a>)</td></tr>
+    <tr><td>iOS applications (<a href="http://bazel.build/docs/be/objective-c.html#ios_application">build</a>)</td></tr>
+    <tr><td>Skylark extension mechanism (<a href="http://bazel.build/docs/skylark/index.html">build</a>)</td></tr>
     <tr><td>Basic test suite on GitHub</td></tr>
-    <tr><td>Support for fetching dependencies from <a href="http://bazel.io/docs/be/workspace.html#maven_jar">Maven repositories</a>
-        and <a href="http://bazel.io/docs/be/workspace.html#http_archive">web servers</a></td></tr>
+    <tr><td>Support for fetching dependencies from <a href="http://bazel.build/docs/be/workspace.html#maven_jar">Maven repositories</a>
+        and <a href="http://bazel.build/docs/be/workspace.html#http_archive">web servers</a></td></tr>
     <tr>
       <td rowspan="30"><b><a name="beta"></a>Beta</b></td>
       <td rowspan="9">
@@ -80,15 +80,15 @@ be refined if appropriate.
       <td rowspan="9"><b>2015&#8209;09&#8209;01</b></td>
       <td>P0. Binary distribution for Linux & OS X</td<
     </tr>
-    <tr><td>P0. Public <a href="http://ci.bazel.io">continuous integration system</a></td></tr>
-    <tr><td>P0. Support for <a href="http://bazel.io/docs/external.html">fetching transitive dependencies from Maven Central</a></td></tr>
-    <tr><td>P0. Android application (<a href="http://bazel.io/docs/be/android.html#android_binary">build</a>
-        and <a href="http://bazel.io/docs/bazel-user-manual.html#mobile-install">install</a>)</td></tr>
-    <tr><td>P1. Support for <a href="http://bazel.io/docs/external.html">prefetching and caching remote dependencies</a></td></tr>
-    <tr><td>P1. Docker (<a href="http://bazel.io/docs/be/docker.html">build and load</a>)</td></tr>
-    <tr><td>P2. <a href="http://bazel.io/docs/bazel-user-manual.html#sandboxing">Sandboxing of actions for Linux</a></td></tr>
-    <tr><td>P2. AppEngine (<a href="http://bazel.io/docs/be/appengine.html">build and load</a>)</td></tr>
-    <tr><td>P2. <a href="http://bazel.io/blog/2015/07/29/dashboard-dogfood.html">Test result dashboard</a></tr></td>
+    <tr><td>P0. Public <a href="http://ci.bazel.build">continuous integration system</a></td></tr>
+    <tr><td>P0. Support for <a href="http://bazel.build/docs/external.html">fetching transitive dependencies from Maven Central</a></td></tr>
+    <tr><td>P0. Android application (<a href="http://bazel.build/docs/be/android.html#android_binary">build</a>
+        and <a href="http://bazel.build/docs/bazel-user-manual.html#mobile-install">install</a>)</td></tr>
+    <tr><td>P1. Support for <a href="http://bazel.build/docs/external.html">prefetching and caching remote dependencies</a></td></tr>
+    <tr><td>P1. Docker (<a href="http://bazel.build/docs/be/docker.html">build and load</a>)</td></tr>
+    <tr><td>P2. <a href="http://bazel.build/docs/bazel-user-manual.html#sandboxing">Sandboxing of actions for Linux</a></td></tr>
+    <tr><td>P2. AppEngine (<a href="http://bazel.build/docs/be/appengine.html">build and load</a>)</td></tr>
+    <tr><td>P2. <a href="http://bazel.build/blog/2015/07/29/dashboard-dogfood.html">Test result dashboard</a></tr></td>
     <tr>
       <td rowspan="5">
         <a href="https://github.com/bazelbuild/bazel/releases/tag/0.2.0"><b>0.2</b>
@@ -97,7 +97,7 @@ be refined if appropriate.
       <td rowspan="5"><b>2016&#8209;02&#8209;18</b></td>
       <td>P0. <a href="https://github.com/bazelbuild/bazel/tree/master/src/test/java/com/google/devtools">Significantly increase test coverage</a></td>
     </tr>
-    <tr><td>P0. Support for fetching <a href="http://bazel.io/docs/external.html">remote</a> <a href="http://bazel.io/docs/be/functions.html#load">Skylark rules</a></td></tr>
+    <tr><td>P0. Support for fetching <a href="http://bazel.build/docs/external.html">remote</a> <a href="http://bazel.build/docs/be/functions.html#load">Skylark rules</a></td></tr>
     <tr><td>P2. <a href="https://github.com/bazelbuild/rules_go">Go language support (build and tests)</a></td></tr>
     <tr><td>P2. <a href="https://github.com/bazelbuild/bazel/releases/latest">Debian packages for Bazel</a></td></tr>
     <tr><td>P2. <a href="http://braumeister.org/formula/bazel">OS X homebrew recipe for distributing Bazel</a></td></tr>
@@ -107,10 +107,10 @@ be refined if appropriate.
         <br/><span class="label label-default">Released</span></a>
       </td>
       <td rowspan="5"><b>2016&#8209;06&#8209;10</b></td>
-      <td>P0. <a href="http://bazel.io/docs/windows.html">Bazel can bootstrap itself on Windows without requiring admin privileges</a></td></tr>
+      <td>P0. <a href="http://bazel.build/docs/windows.html">Bazel can bootstrap itself on Windows without requiring admin privileges</a></td></tr>
     </tr>
-    <tr><td>P1. <a href="http://bazel.io/blog/2016/06/10/ide-support.html">Interface for IDE support</a></td></tr>
-    <tr><td>P1. IDE support for <a href="http://tulsi.bazel.io">Xcode (stable)</a> and <a href="https://github.com/bazelbuild/e4b">Eclipse (experimental)</a></td></tr>
+    <tr><td>P1. <a href="http://bazel.build/blog/2016/06/10/ide-support.html">Interface for IDE support</a></td></tr>
+    <tr><td>P1. IDE support for <a href="http://tulsi.bazel.build">Xcode (stable)</a> and <a href="https://github.com/bazelbuild/e4b">Eclipse (experimental)</a></td></tr>
     <tr><td>P1. <a href="https://docs.google.com/document/d/1jKbNXOVp2T1zJD_iRnVr8k5D0xZKgO8blMVDlXOksJg">Custom remote repositories using Skylark</a></td></tr>
     <tr><td>P2. <a href="https://github.com/bazelbuild/bazel/commit/79adf59e2973754c8c0415fcab45cd58c7c34697">Prototype for distributed caching of build artifact</a></td></tr>
     <tr>