Skip to content

Commit

Permalink
Inclusive naming fixit
Browse files Browse the repository at this point in the history
Update links to docs version for bazel at head.

RELNOTES: None
PiperOrigin-RevId: 379565006
  • Loading branch information
aiuto authored and copybara-github committed Jun 15, 2021
1 parent 81d675b commit 4261b2a
Show file tree
Hide file tree
Showing 50 changed files with 71 additions and 71 deletions.
2 changes: 1 addition & 1 deletion scripts/packages/bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ if [[ ! -x $BAZEL_REAL ]]; then
echo " sudo apt update && sudo apt install bazel-${bazel_version}"
echo ""
echo "If this doesn't work, check Bazel's installation instructions for help:"
echo " https://docs.bazel.build/versions/master/install-ubuntu.html") 2>&1
echo " https://docs.bazel.build/versions/main/install-ubuntu.html") 2>&1
else
(echo ""
echo "Bazel binaries for all official releases can be downloaded from here:"
Expand Down
2 changes: 1 addition & 1 deletion scripts/packages/chocolatey/bazel.nuspec.template
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
<licenseUrl>https://github.com/bazelbuild/bazel/tree/master/LICENSE</licenseUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<projectSourceUrl>https://github.com/bazelbuild/bazel.git</projectSourceUrl>
<docsUrl>https://www.bazel.build/versions/master/docs/getting-started.html</docsUrl>
<docsUrl>https://www.bazel.build/versions/main/docs/getting-started.html</docsUrl>
<mailingListUrl>https://groups.google.com/forum/#!forum/bazel-discuss</mailingListUrl>
<bugTrackerUrl>https://github.com/bazelbuild/bazel/issues</bugTrackerUrl>
<tags>bazel build automation</tags>
Expand Down
4 changes: 2 additions & 2 deletions site/_includes/documentation-sidebar/0/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ <h3>Using Bazel</h3>
<li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
<li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
<li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
<li><a href="/versions/master/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/master/visibility.html">Visibility</a></li>
<li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/main/visibility.html">Visibility</a></li>
</ul>
</li>

Expand Down
4 changes: 2 additions & 2 deletions site/_includes/documentation-sidebar/1/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ <h3>Using Bazel</h3>
<li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
<li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
<li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
<li><a href="/versions/master/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/master/visibility.html">Visibility</a></li>
<li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/main/visibility.html">Visibility</a></li>
</ul>
</li>

Expand Down
4 changes: 2 additions & 2 deletions site/_includes/documentation-sidebar/2/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ <h3>Using Bazel</h3>
<li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
<li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
<li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
<li><a href="/versions/master/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/master/visibility.html">Visibility</a></li>
<li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/main/visibility.html">Visibility</a></li>
</ul>
</li>

Expand Down
4 changes: 2 additions & 2 deletions site/_includes/documentation-sidebar/3/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ <h3>Using Bazel</h3>
<li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
<li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
<li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
<li><a href="/versions/master/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/master/visibility.html">Visibility</a></li>
<li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/main/visibility.html">Visibility</a></li>
</ul>
</li>

Expand Down
4 changes: 2 additions & 2 deletions site/_includes/documentation-sidebar/4/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ <h3>Using Bazel</h3>
<li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
<li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
<li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
<li><a href="/versions/master/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/master/visibility.html">Visibility</a></li>
<li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/main/visibility.html">Visibility</a></li>
</ul>
</li>

Expand Down
4 changes: 2 additions & 2 deletions site/_includes/getting-started-sidebar/0/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ <h3>Using Bazel</h3>
<li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
<li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
<li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
<li><a href="/versions/master/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/master/visibility.html">Visibility</a></li>
<li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/main/visibility.html">Visibility</a></li>
</ul>
</li>

Expand Down
4 changes: 2 additions & 2 deletions site/_includes/getting-started-sidebar/1/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ <h3>Using Bazel</h3>
<li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
<li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
<li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
<li><a href="/versions/master/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/master/visibility.html">Visibility</a></li>
<li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/main/visibility.html">Visibility</a></li>
</ul>
</li>

Expand Down
4 changes: 2 additions & 2 deletions site/_includes/getting-started-sidebar/2/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ <h3>Using Bazel</h3>
<li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
<li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
<li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
<li><a href="/versions/master/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/master/visibility.html">Visibility</a></li>
<li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/main/visibility.html">Visibility</a></li>
</ul>
</li>

Expand Down
4 changes: 2 additions & 2 deletions site/_includes/getting-started-sidebar/3/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ <h3>Using Bazel</h3>
<li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
<li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
<li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
<li><a href="/versions/master/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/master/visibility.html">Visibility</a></li>
<li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/main/visibility.html">Visibility</a></li>
</ul>
</li>

Expand Down
4 changes: 2 additions & 2 deletions site/_includes/getting-started-sidebar/4/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ <h3>Using Bazel</h3>
<li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
<li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
<li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
<li><a href="/versions/master/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/master/visibility.html">Visibility</a></li>
<li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
<li><a href="/versions/main/visibility.html">Visibility</a></li>
</ul>
</li>

Expand Down
2 changes: 1 addition & 1 deletion site/_layouts/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
nav: docs
---

<!-- /versions/master/foo/bar -> ["master", "foo", "bar"] -->
<!-- /versions/main/foo/bar -> ["main", "foo", "bar"] -->
<!-- /versions/0.12.3/baz.md -> ["0.12.3", "baz.md"] -->
{% assign versioned_url_parts = page.url | split: '/' | shift | shift %}
{% assign current_version = versioned_url_parts.first %}
Expand Down
4 changes: 2 additions & 2 deletions site/docs/platforms-intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,8 @@ contact
[Platforms]: platforms.md
[Toolchains]: toolchains.md
[Inspiration]: https://blog.bazel.build/2019/02/11/configurable-builds-part-1.html
[C++ Rules]: /versions/master/bazel-and-cpp.html
[Android Rules]: /versions/master/bazel-and-android.html
[C++ Rules]: /versions/main/bazel-and-cpp.html
[Android Rules]: /versions/main/bazel-and-android.html
[Common Platform Declarations]: https://github.com/bazelbuild/platforms#motivation
[select()]: https://docs.bazel.build/versions/main/configurable-attributes.html
[select() Platforms]: configurable-attributes.md#platforms
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public static enum RuleType {
// StarlarkDocumentationProcessor#parseOptions

// Build Encyclopedia documentation root
public static String BeDocsRoot = "/versions/master/be";
public static String BeDocsRoot = "/versions/main/be";

// Documentation files extension
public static String documentationExtension = "html";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ many functions or build rules.
substring, such as <code>//mypkg:target</code>, and that label is a
declared prerequisite of the current rule, it is expanded into the
pathname of the file represented by the
<a href="https://docs.bazel.build/versions/master/glossary.html#target">target</a>
<a href="https://docs.bazel.build/versions/main/glossary.html#target">target</a>
<code>//mypkg:target</code>.
</p>

Expand Down Expand Up @@ -168,13 +168,13 @@ config_setting(
<p>
Bazel evaluates configurable attributes after processing macros and before
processing rules (technically, between the
<a href="https://docs.bazel.build/versions/master/skylark/concepts.html#evaluation-model">
<a href="https://docs.bazel.build/versions/main/skylark/concepts.html#evaluation-model">
loading and analysis phases</a>).
Any processing before <code>select()</code> evaluation doesn't know which
branch the <code>select()</code> chooses. Macros, for example, can't change
their behavior based on the chosen branch, and <code>bazel query</code> can
only make conservative guesses about a target's configurable dependencies. See
<a href="https://docs.bazel.build/versions/master/configurable-attributes.html#faq">
<a href="https://docs.bazel.build/versions/main/configurable-attributes.html#faq">
this FAQ</a>
for more on using <code>select()</code> with rules and macros.
</p>
Expand All @@ -187,7 +187,7 @@ config_setting(
</p>

<p>
See <a href="https://docs.bazel.build/versions/master/configurable-attributes.html">
See <a href="https://docs.bazel.build/versions/main/configurable-attributes.html">
Configurable Build Attributes</a> for a detailed overview.
</p>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ title: Make Variables
<ul><!-- keep alphabetically sorted -->
<li><code>COMPILATION_MODE</code>:
<code>fastbuild</code>, <code>dbg</code>, or <code>opt</code>. (<a
href="https://docs.bazel.build/versions/master/user-manual.html#flag--compilation_mode">more
href="https://docs.bazel.build/versions/main/user-manual.html#flag--compilation_mode">more
details</a>)
</li>
</ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
/**
* A container class for groups of {@link ExecGroup} instances. This correctly handles exec group
* inheritance between rules and targets. See
* https://docs.bazel.build/versions/master/exec-groups.html for further details.
* https://docs.bazel.build/versions/main/exec-groups.html for further details.
*/
@AutoValue
public abstract class ExecGroupCollection {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ public static RunfilesSupport withExecutable(
/**
* Creates and returns a {@link RunfilesSupport} object for the given rule and executable. This
* version discards all arguments. Only use this for <a
* href="https://docs.bazel.build/versions/master/platforms.html#skipping-incompatible-targets">Incompatible
* href="https://docs.bazel.build/versions/main/platforms.html#skipping-incompatible-targets">Incompatible
* Target Skipping</a>.
*/
public static RunfilesSupport withExecutableButNoArgs(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ static Map<String, BuildOptions> applyAndValidate(
* <p>Transitions can also explicitly set --platforms to be clear what platform they set.
*
* <p>Platform mappings:
* https://docs.bazel.build/versions/master/platforms-intro.html#platform-mappings.
* https://docs.bazel.build/versions/main/platforms-intro.html#platform-mappings.
*
* <p>This doesn't check that the changed value is actually different than the source (i.e.
* setting {@code --cpu=foo} when {@code --cpu} is already {@code foo}). That could unnecessarily
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ private static Attribute.Builder<?> createAttribute(
if (!containsNonNoneKey(arguments, CONFIGURATION_ARG)) {
throw Starlark.errorf(
"cfg parameter is mandatory when executable=True is provided. Please see "
+ "https://www.bazel.build/versions/master/docs/skylark/rules.html#configurations "
+ "https://www.bazel.build/versions/main/docs/skylark/rules.html#configurations "
+ "for more details.");
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public Metadata getMetadata() {
<code>WORKSPACE</code> file.
<p>
For more information, read the <a href="https://docs.bazel.build/versions/master/android-ndk.html">
For more information, read the <a href="https://docs.bazel.build/versions/main/android-ndk.html">
full documentation on using Android NDK with Bazel</a>.
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public Runfiles.EmptyFilesSupplier getEmptyRunfilesSupplier() {
@Override
public String getSrcsVersionDocURL() {
// TODO(#8996): Update URL to point to rules_python's docs instead of the Bazel site.
return "https://docs.bazel.build/versions/master/be/python.html#py_binary.srcs_version";
return "https://docs.bazel.build/versions/main/be/python.html#py_binary.srcs_version";
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public String getLineTerminator() {
+ " --universe_scope value inferred for a query expression that uses universe-scoped"
+ " functions (e.g.`allrdeps`) may not be what you want, so you should use this"
+ " option only if you know what you are doing. See"
+ " https://docs.bazel.build/versions/master/query.html#sky-query for details and"
+ " https://docs.bazel.build/versions/main/query.html#sky-query for details and"
+ " examples. If --universe_scope is set, then this option's value is ignored. Note:"
+ " this option applies only to `query` (i.e. not `cquery`).")
public boolean inferUniverseScope;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Remote caching and execution with Bazel

The documentation has been moved to https://docs.bazel.build/versions/master/remote-caching.html.
The documentation has been moved to https://docs.bazel.build/versions/main/remote-caching.html.
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public final class RemoteOptions extends OptionsBase {
"A URI of a caching endpoint. The supported schemas are http, https, grpc, grpcs "
+ "(grpc with TLS enabled) and unix (local UNIX sockets). If no schema is provided "
+ "Bazel will default to grpcs. Specify grpc://, http:// or unix: schema to disable "
+ "TLS. See https://docs.bazel.build/versions/master/remote-caching.html")
+ "TLS. See https://docs.bazel.build/versions/main/remote-caching.html")
public String remoteCache;

@Option(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ If a key references a flag that can be set multiple times on the command line (e

/* <!-- #BLAZE_RULE(config_setting).ATTRIBUTE(flag_values) -->
The same as <a href="${link config_setting.values}"><code>values</code></a> but
for <a href="https://docs.bazel.build/versions/master/skylark/config.html#user-defined-build-settings">
for <a href="https://docs.bazel.build/versions/main/skylark/config.html#user-defined-build-settings">
Starlark-defined flags</a>.
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */

Expand All @@ -249,7 +249,7 @@ If a key references a flag that can be set multiple times on the command line (e
The minimum set of <code>constraint_values</code> that the target platform must specify
in order to match this <code>config_setting</code>. (The execution platform is not
considered here.) Any additional constraint values that the platform has are ignored. See
<a href="https://docs.bazel.build/versions/master/configurable-attributes.html#platforms">
<a href="https://docs.bazel.build/versions/main/configurable-attributes.html#platforms">
Configurable Build Attributes</a> for details.
<p>In the case where two <code>config_setting</code>s both match in the same
Expand Down Expand Up @@ -350,7 +350,7 @@ <li>For flags that support shorthand forms (e.g. <code>--compilation_mode</code>
<li>
If a flag takes multiple values (like <code>--copt=-Da --copt=-Db</code> or a list-typed
<a href="https://docs.bazel.build/versions/master/skylark/config.html#user-defined-build-settings">
<a href="https://docs.bazel.build/versions/main/skylark/config.html#user-defined-build-settings">
Starlark flag</a>), <code>values = { "flag": "a" }</code> matches if <code>"a"</code> is
present <i>anywhere</i> in the actual list.
Expand All @@ -369,7 +369,7 @@ If a flag takes multiple values (like <code>--copt=-Da --copt=-Db</code> or a li
</li>
<li>If you need to define conditions that aren't modeled by built-in Bazel flags, use
<a href="https://docs.bazel.build/versions/master/skylark/config.html#user-defined-build-settings">
<a href="https://docs.bazel.build/versions/main/skylark/config.html#user-defined-build-settings">
Starlark-defined flags</a>. You can also use <code>--define</code>, but this offers weaker
support and is not recommended. See
<a href="${link common-definitions#configurable-attributes}">here</a> for more discussion.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ public Metadata getMetadata() {
<p>
Use <code>toolchain_config</code> attribute to configure the C++ toolchain.
See also this
<a href="https://docs.bazel.build/versions/master/cc-toolchain-config-reference.html">
<a href="https://docs.bazel.build/versions/main/cc-toolchain-config-reference.html">
page
</a> for elaborate C++ toolchain configuration and toolchain selection documentation.
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public Metadata getMetadata() {
<p>
See also this
<a href="https://docs.bazel.build/versions/master/cc-toolchain-config-reference.html">
<a href="https://docs.bazel.build/versions/main/cc-toolchain-config-reference.html">
page
</a> for elaborate C++ toolchain configuration and toolchain selection documentation.
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public Metadata getMetadata() {
<p>
<b>WARNING:</b> Extra actions are deprecated. Use
<a href="https://docs.bazel.build/versions/master/skylark/aspects.html">aspects</a>
<a href="https://docs.bazel.build/versions/main/skylark/aspects.html">aspects</a>
instead.
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public Metadata getMetadata() {
<p>
<b>WARNING:</b> Extra actions are deprecated. Use
<a href="https://docs.bazel.build/versions/master/skylark/aspects.html">aspects</a>
<a href="https://docs.bazel.build/versions/main/skylark/aspects.html">aspects</a>
instead.
</p>
Expand Down
Loading

0 comments on commit 4261b2a

Please sign in to comment.