Bazel DevSite: Fix links that rely on redirects.

During the recent site overhaul a lot of files were moved to new locations, without updating any links to them. Instead, redirects were set up.

This works fine for files @ HEAD, but breaks horribly for the 6.0 docs (and any future release docs).

Consequently, this CL fixes the links for both HEAD and 6.0 to avoid such problems in the future.

PiperOrigin-RevId: 496481366
Change-Id: I0bfde556cbb61d6ba50dd24120febf87ab46302d

site/en/_book.yaml

@@ -86,7 +86,7 @@ upper_tabs:
       - title: Platforms
         path: /concepts/platforms
       - title: Hermeticity
-        path: /concepts/hermeticity
+        path: /basics/hermeticity
 
 - name: User guide
   heading: Guides and tutorials for learning to use Bazel
@@ -229,7 +229,7 @@ upper_tabs:
     - name: Query language
       contents:
       - title: Query reference
-        path: /reference/query
+        path: /query/language
     - name: Glossary
       contents:
       - title: Glossary
@@ -344,7 +344,7 @@ upper_tabs:
       - title: Bazel users
         path: /community/users
       - title: Nominate a recommended rule
-        path: /contribute/recommended-rules
+        path: /community/recommended-rules
       - title: Remote execution services
         path: /community/remote-execution-services
     - name: Getting help

site/en/about/faq.md

@@ -43,7 +43,7 @@ A long time ago, Google built its software using large, generated Makefiles. The
 
 ## Does Bazel require a build cluster?
 
-Bazel runs build operations locally by default. However, Bazel can also connect to a build cluster for even faster builds and tests. See our documentation on [remote execution and caching](/docs/remote-execution) and [remote caching](/docs/remote-caching) for further details.
+Bazel runs build operations locally by default. However, Bazel can also connect to a build cluster for even faster builds and tests. See our documentation on [remote execution and caching](/remote/rbe) and [remote caching](/remote/caching) for further details.
 
 ## How does the Google development process work?
 
@@ -160,17 +160,17 @@ Further details on exit codes are in the [User Manual](/docs/user-manual).
 
 ## What future features can we expect in Bazel?
 
-See our [Roadmaps](/community/roadmaps).
+See our [Roadmaps](/about/roadmap).
 
 ## Can I use Bazel for my INSERT LANGUAGE HERE project?
 
 Bazel is extensible. Anyone can add support for new languages. Many languages are supported: see the [build encyclopedia](/reference/be/overview) for a list of recommendations and [awesomebazel.com](https://awesomebazel.com/){: .external} for a more comprehensive list.
 
-If you would like to develop extensions or learn how they work, see the documentation for [extending Bazel](/rules/concepts).
+If you would like to develop extensions or learn how they work, see the documentation for [extending Bazel](/extending/concepts).
 
 ## Can I contribute to the Bazel code base?
 
-See our [contribution guidelines](/contribute/guide).
+See our [contribution guidelines](/contribute/).
 
 ## Why isn’t all development done in the open?
 

site/en/about/intro.md

@@ -69,7 +69,7 @@ To build or test a project with Bazel, you typically do the following:
    places your outputs within the workspace.
 
 In addition to building, you can also use Bazel to run
-[tests](/reference/test-encyclopedia) and [query](/docs/query-how-to) the build
+[tests](/reference/test-encyclopedia) and [query](//query/guide) the build
 to trace dependencies in your code.
 
 ## Bazel build process {:#bazel-build-process}
@@ -80,7 +80,7 @@ When running a build or a test, Bazel does the following:
 
 2.  **Analyzes** the inputs and their
     [dependencies](/concepts/dependencies), applies the specified build
-    rules, and produces an [action](/rules/concepts#evaluation-model)
+    rules, and produces an [action](/extending/concepts#evaluation-model)
     graph.
 
 3.  **Executes** the build actions on the inputs until the final build outputs
@@ -89,24 +89,24 @@ When running a build or a test, Bazel does the following:
 Since all previous build work is cached, Bazel can identify and reuse cached
 artifacts and only rebuild or retest what's changed. To further enforce
 correctness, you can set up Bazel to run builds and tests
-[hermetically](/concepts/hermeticity) through sandboxing, minimizing skew
-and maximizing [reproducibility](/docs/build#correct-incremental-rebuilds).
+[hermetically](/basics/hermeticity) through sandboxing, minimizing skew
+and maximizing [reproducibility](/run/build#correct-incremental-rebuilds).
 
 ### Action graph {:#action-graph}
 
 The action graph represents the build artifacts, the relationships between them,
 and the build actions that Bazel will perform. Thanks to this graph, Bazel can
-[track](/docs/build#build-consistency) changes to
+[track](/run/build#build-consistency) changes to
 file content as well as changes to actions, such as build or test commands, and
 know what build work has previously been done. The graph also enables you to
-easily [trace dependencies](/docs/query-how-to) in your code.
+easily [trace dependencies](//query/guide) in your code.
 
 ## Getting started tutorials {:#getting-started-tutorials}
 
-To get started with Bazel, see [Getting Started](/start/getting-started) or jump
+To get started with Bazel, see [Getting Started](/start/) or jump
 directly to the Bazel tutorials:
 
-*   [Tutorial: Build a C++ Project](/tutorials/cpp)
-*   [Tutorial: Build a Java Project](/tutorials/java)
-*   [Tutorial: Build an Android Application](/tutorials/android-app)
-*   [Tutorial: Build an iOS Application](/tutorials/ios-app)
+*   [Tutorial: Build a C++ Project](/start/cpp)
+*   [Tutorial: Build a Java Project](/start/java)
+*   [Tutorial: Build an Android Application](/start/android-app )
+*   [Tutorial: Build an iOS Application](/start/ios-app))

site/en/about/roadmap.md

@@ -20,7 +20,7 @@ Q4 brings Bazel 6.0 — the new [long term support (LTS)](https://bazel.build/re
 
 ### Bzlmod: external dependency management system
 
-[Bzlmod](https://bazel.build/docs/bzlmod) automatically resolves transitive dependencies, allowing projects to scale while staying fast and resource-efficient. Introduced experimentally in Bazel 5.0, Bzlmod will be generally available and  provide a solution for the [diamond dependency problem](https://docs.google.com/document/d/1moQfNcEIttsk6vYanNKIy3ZuK53hQUFq1b1r0rmsYVg/edit#heading=h.lgyp7ubwxmjc).
+[Bzlmod](https://bazel.build/build/bzlmod) automatically resolves transitive dependencies, allowing projects to scale while staying fast and resource-efficient. Introduced experimentally in Bazel 5.0, Bzlmod will be generally available and  provide a solution for the [diamond dependency problem](https://docs.google.com/document/d/1moQfNcEIttsk6vYanNKIy3ZuK53hQUFq1b1r0rmsYVg/edit#heading=h.lgyp7ubwxmjc).
 
 *   Bzlmod goes from ‘experimental’ to ‘generally available’
 *   [Bzlmod Migration Guide](https://docs.google.com/document/d/1JtXIVnXyFZ4bmbiBCr5gsTH4-opZAFf5DMMb-54kES0/edit?usp=gmail) provides tools, scripts, and documentation to teams looking to adopt Bzlmod
@@ -41,7 +41,7 @@ Bazel 6.0 will include improved tooling and merged-in community feature contribu
 
 ### Optional toolchains
 
-Our Developer Satisfaction survey showed that rule authors want support for further toolchain development. Bazel 6.0 will allow authors to write rules using an [optional, high performance toolchain](https://bazel.build/docs/toolchains#optional-toolchains) when available with a fallback implementation for other platforms.
+Our Developer Satisfaction survey showed that rule authors want support for further toolchain development. Bazel 6.0 will allow authors to write rules using an [optional, high performance toolchain](https://bazel.build/extending/toolchains#optional-toolchains) when available with a fallback implementation for other platforms.
 
 ### Bazel-JetBrains\* IntelliJ IDEA support
 

site/en/about/vision.md

@@ -85,7 +85,7 @@ any language.
     ["Bazel sandwich"](https://github.com/bazelbuild/bazel-website/blob/master/designs/_posts/2016-08-04-extensibility-for-native-rules.md)
     principles.
 1.  The rules need to be **remote-execution ready**. In practice, this means
-    **configurable using the [toolchains](/docs/toolchains) mechanism**.
+    **configurable using the [toolchains](/extending/toolchains) mechanism**.
 1.  The rules (and Bazel) need to interface with a **widely-used IDE** for the
     language, if there is one.
 1.  The rules need to have **thorough, usable documentation,** with introductory

site/en/basics/artifact-based-builds.md

@@ -172,7 +172,7 @@ at a known location. Just like any other dependency, if the Java compiler
 changes, every artifact that depends on it is rebuilt.
 
 Bazel solves the second part of the problem, platform independence, by setting
-[build configurations](/docs/build#build-config-cross-compilation). Rather than
+[build configurations](/run/build#build-config-cross-compilation). Rather than
 targets depending directly on their tools, they depend on types of configurations:
 
 *   **Host configuration**: building tools that run during the build
@@ -185,7 +185,7 @@ box, but engineers will always want to do more—part of the benefit of task-bas
 systems is their flexibility in supporting any kind of build process, and it
 would be better not to give that up in an artifact-based build system.
 Fortunately, Bazel allows its supported target types to be extended by
-[adding custom rules](/rules/rules).
+[adding custom rules](/extending/rules).
 
 To define a rule in Bazel, the rule author declares the inputs that the rule
 requires (in the form of attributes passed in the `BUILD` file) and the fixed

site/en/basics/hermeticity.md

@@ -72,18 +72,18 @@ non-hermetic actions.
   step twice or on different systems, compare a hash of the file contents and
   get results that differ, the build is not reproducible.
 * Run steps to
-  [debug local cache hits](/docs/remote-execution-caching-debug#troubleshooting-cache-hits)
+  [debug local cache hits](/remote/cache-remote#troubleshooting-cache-hits)
   from a variety of potential client machines to ensure that you catch any
   cases of client environment leaking into the actions.
 * Execute a build within a docker container that contains nothing but the
   checked-out source tree and explicit list of host tools. Build breakages and
   error messages will catch implicit system dependencies.
 * Discover and fix hermeticity problems using
-  [remote execution rules](/docs/remote-execution-rules#overview).
+  [remote execution rules](/remote/rules#overview).
 * Enable strict [sandboxing](/docs/sandboxing)
   at the per-action level, since actions in a build can be stateful and affect
   the build or the output.
-* [Workspace rules](/docs/workspace-log)
+* [Workspace rules](/remote/workspace)
   allow developers to add dependencies to external workspaces, but they are
   rich enough to allow arbitrary processing to happen in the process. You can
   get a log of some potentially non-hermetic actions in Bazel workspace rules by

site/en/build/external.md

@@ -10,7 +10,7 @@ projects are called _external dependencies_.
 
 Note: Bazel 5.0 and newer has a new external dependency system, codenamed
 "Bzlmod", which renders a lot of the content on this page obsolete. See [Bzlmod
-user guide](/docs/bzlmod) for more information.
+user guide](/build/bzlmod) for more information.
 
 The `WORKSPACE` file (or `WORKSPACE.bazel` file) in the
 [workspace directory](/concepts/build-ref#workspace)
@@ -257,15 +257,15 @@ Specifically:
 * Use `--host_jvm_args=-Djava.net.preferIPv6Addresses=true`
   [startup option](/docs/user-manual#startup-options),
   for example by adding the following line in your
-  [`.bazelrc` file](/docs/bazelrc):
+  [`.bazelrc` file](/run/bazelrc):
 
   `startup --host_jvm_args=-Djava.net.preferIPv6Addresses=true`
 
 * If you are running Java build targets that need to connect to the internet
   as well (integration tests sometimes needs that), also use
   `--jvmopt=-Djava.net.preferIPv6Addresses=true`
   [tool flag](/docs/user-manual#jvmopt), for example by having the
-  following line in your [`.bazelrc` file](/docs/bazelrc):
+  following line in your [`.bazelrc` file](/run/bazelrc):
 
   `build --jvmopt=-Djava.net.preferIPv6Addresses`
 
@@ -361,7 +361,7 @@ Prefer [`http_archive`](/rules/lib/repo/http#http_archive) to `git_repository` a
   into Bazel and has no system dependencies.
 * `http_archive` supports a list of `urls` as mirrors, and `git_repository` supports only
   a single `remote`.
-* `http_archive` works with the [repository cache](/docs/build#repository-cache), but not
+* `http_archive` works with the [repository cache](/run/build#repository-cache), but not
   `git_repository`. See
    [#5116](https://github.com/bazelbuild/bazel/issues/5116){: .external} for more information.
 

site/en/community/_index.yaml

@@ -99,7 +99,7 @@ landing_page:
     - heading: Bazel users
       path: /community/users
     - heading: Nominate a recommended rule
-      path: /contribute/recommended-rules
+      path: /community/recommended-rules
     - heading: Remote execution services
       path: /community/remote-execution-services
     - heading: Support channels

site/en/community/recommended-rules.md

@@ -18,7 +18,7 @@ If a ruleset meets the requirements below, a rule maintainer can nominate it
 to be part of the _recommended rules_ by filing a
 [GitHub issue](https://github.com/bazelbuild/bazel/){: .external}.
 
-After a review by the [Bazel core team](/contribute/contribution-policy), it
+After a review by the [Bazel core team](/contribute/policy), it
 will be recommended on the Bazel website.
 
 ## Requirements for the rule maintainers {:#requirements-rule-maintainers}

site/en/community/roadmaps-configurability.md

@@ -55,7 +55,7 @@ Book: /_book.yaml
 * Builds scale well, particularly w.r.t graph size and action caching.
 
 We also support
-[`cquery`](https://bazel.build/docs/cquery), [`Starlark
+[`cquery`](https://bazel.build/query/cquery), [`Starlark
 configuration`](https://bazel.build/rules/config),
 and
 [`select()`](https://bazel.build/docs/configurable-attributes).
@@ -71,7 +71,7 @@ interest of accurate expectations.
 
 <div class="padbottom"></div>
 <span class="etabox">Q3 2021</span>**Android rules use the new [platforms
-API](https://bazel.build/concepts/platforms-intro)**
+API](https://bazel.build/concepts/platforms)**
 <span class="inprogressstatus">IN PROGRESS</span> ([#11749](https://github.com/bazelbuild/bazel/issues/11749))
 
 * This is our main priority for the beginning of 2021.
@@ -82,7 +82,7 @@ platforms](https://docs.google.com/document/d/1U9HzdDmtRnm244CaRM6JV-q2408mbNODA
 <span class="inprogressstatus">IN PROGRESS</span> ([#11748](https://github.com/bazelbuild/bazel/issues/11748))
 
 <div class="padbottom"></div>
-<span class="etabox">paused</span>**C++ rules use the new [platformsfall API](https://bazel.build/concepts/platforms-intro)**
+<span class="etabox">paused</span>**C++ rules use the new [platformsfall API](https://bazel.build/concepts/platforms)**
 <span class="inprogressstatus">IN PROGRESS</span> ([#6516](https://github.com/bazelbuild/bazel/issues/6516))
 
 * This is blocked on Android platforms. We can turn this on with a simple flag flip.

site/en/community/sig.md

@@ -7,7 +7,7 @@ Book: /_book.yaml
 
 Bazel hosts Special Interest Groups (SIGs) to focus collaboration on particular
 areas and to support communication and coordination between [Bazel owners,
-maintainers, and contributors](/contribute/contribution-policy). This policy
+maintainers, and contributors](/contribute/policy). This policy
 applies to [`bazelbuild`](http://github.com/bazelbuild){: .external}.
 
 SIGs do their work in public. The ideal scope for a SIG covers a well-defined

site/en/concepts/build-files.md

@@ -36,7 +36,7 @@ allowed in `BUILD` files; instead list all the arguments explicitly.
 Crucially, programs in Starlark can't perform arbitrary I/O. This invariant
 makes the interpretation of `BUILD` files hermetic — dependent only on a known
 set of inputs, which is essential for ensuring that builds are reproducible.
-For more details, see [Hermeticity](/concepts/hermeticity).
+For more details, see [Hermeticity](/basics/hermeticity).
 
 `BUILD` files should be written using only ASCII characters, although
 technically they are interpreted using the Latin-1 character set.

site/en/concepts/labels.md

@@ -100,14 +100,14 @@ repository that refer to targets in the main repository, and will be
 used from external repositories.
 
 For information about the different ways you can refer to targets, see
-[target patterns](/docs/build#specifying-build-targets).
+[target patterns](/run/build#specifying-build-targets).
 
 ### Lexical specification of a label {:#labels-lexical-specification}
 
 Label syntax discourages use of metacharacters that have special meaning to the
 shell. This helps to avoid inadvertent quoting problems, and makes it easier to
 construct tools and scripts that manipulate labels, such as the
-[Bazel Query Language](/reference/query).
+[Bazel Query Language](/query/language).
 
 The precise details of allowed target names are below.
 
@@ -215,7 +215,7 @@ the build.
 
 This directed acyclic graph over targets is called the _target graph_ or
 _build dependency graph_, and is the domain over which the
-[Bazel Query tool](/docs/query-how-to) operates.
+[Bazel Query tool](//query/guide) operates.
 
 <table class="columns">
   <tr>

site/en/concepts/platforms.md

@@ -107,7 +107,7 @@ or opt in early depends on your specific value / cost needs:
   flags on the command line.
 * Simpler language design. All languages share a common API for defining
   toolchains, using toolchains, and selecting the right toolchain for a platform.
-* Targets can be [skipped](/docs/platforms#skipping-incompatible-targets) in the
+* Targets can be [skipped](/extending/platforms#skipping-incompatible-targets) in the
   build and test phase if they are incompatible with the target platform.
 
 ### Costs {:#costs}
@@ -299,7 +299,7 @@ platforms
 
 If you're designing rules for a new language, use platforms
 to select your language's toolchains. See the
-[toolchains documentation](/docs/toolchains) for a good walkthrough.
+[toolchains documentation](/extending/toolchains) for a good walkthrough.
 
 ### `select()` {:#select}
 
@@ -438,8 +438,8 @@ contact
 * [`hlopko/bazel_platforms_examples`](https://github.com/hlopko/bazel_platforms_examples){: .external}
 * [Example C++ custom toolchain](https://github.com/gregestren/snippets/tree/master/custom_cc_toolchain_with_platforms){: .external}
 
-[Platforms]: /docs/platforms
-[Toolchains]: /docs/toolchains
+[Platforms]: /extending/platforms
+[Toolchains]: /extending/toolchains
 [Inspiration]: https://blog.bazel.build/2019/02/11/configurable-builds-part-1.html
 [C++ Rules]: /docs/bazel-and-cpp
 [Android Rules]: /docs/bazel-and-android
@@ -451,11 +451,11 @@ contact
 [constraint_value Rule]: /reference/be/platform#constraint_value
 [constraint_setting Rule]: /reference/be/platform#constraint_setting
 [Starlark rule]: /rules/rules
-[Starlark provider]: /rules/rules#providers
+[Starlark provider]: /extending/rules#providers
 [target_compatible_with Attribute]: /reference/be/platform#toolchain.target_compatible_with
 [exec_compatible_with Attribute]: /reference/be/platform#toolchain.exec_compatible_with
 [register_toolchains Function]: /rules/lib/globals#register_toolchains
 [extra_toolchains Flag]: /reference/command-line-reference#flag--extra_toolchains
 [Starlark transitions]: /rules/config#user-defined-transitions
-[Defining Constraints and Platforms]: /docs/platforms#constraints-platforms
-[Configuring C++ toolchains]: /tutorials/cc-toolchain-config
+[Defining Constraints and Platforms]: /extending/platforms#constraints-platforms
+[Configuring C++ toolchains]: /tutorials/ccp-toolchain-config