Clarify which strategy options override which ones.
RELNOTES: None.
PiperOrigin-RevId: 374633343
diff --git a/site/docs/user-manual.html b/site/docs/user-manual.html
index a23aa58..01ddf9c 100644
--- a/site/docs/user-manual.html
+++ b/site/docs/user-manual.html
@@ -933,8 +933,10 @@
<h4 id='flag--strategy'><code class='flag'>--strategy <var>mnemonic</var>=<var>strategy</var></code></h4>
<p>
- This option controls where and how commands are executed, overriding the default setting on a
- per-mnemonic basis. See
+ This option controls where and how commands are executed, overriding the
+ <code class='flag'><a href="#flag--spawn_strategy">--spawn_strategy</a></code> (and
+ <code class='flag'><a href="#flag--genrule_strategy">--genrule_strategy</a></code> with mnemonic
+ Genrule) on a per-mnemonic basis. See
<code class='flag'><a href="#flag--spawn_strategy">--spawn_strategy</a></code> for the supported
strategies and their effects.
</p>
diff --git a/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java b/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java
index c79dec3..0d110d4 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java
@@ -94,7 +94,8 @@
"Specify how to distribute compilation of other spawn actions. Accepts a comma-separated"
+ " list of strategies from highest to lowest priority. For each action Bazel picks"
+ " the strategy with the highest priority that can execute the action. The default"
- + " value is \"remote,worker,sandboxed,local\". See"
+ + " value is \"remote,worker,sandboxed,local\". This flag overrides the values set"
+ + " by --spawn_strategy (and --genrule_strategy if used with mnemonic Genrule). See"
+ " https://blog.bazel.build/2019/06/19/list-strategy.html for details.")
public List<Map.Entry<String, List<String>>> strategy;
