aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/docgen/templates
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-04-19 02:03:24 +0200
committerGravatar Klaus Aehlig <aehlig@google.com>2017-04-19 10:49:43 +0200
commit57df98e8ac121d7ed1e552ce8cc98a116511655a (patch)
treeff720e3d27492a04a8e904f1791a6ef402165891 /src/main/java/com/google/devtools/build/docgen/templates
parent5020f7e400aa20e665efcc6da2751752e9004690 (diff)
RELNOTES: Fix select condition intersections.
PiperOrigin-RevId: 153531483
Diffstat (limited to 'src/main/java/com/google/devtools/build/docgen/templates')
-rw-r--r--src/main/java/com/google/devtools/build/docgen/templates/be/functions.vm10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/docgen/templates/be/functions.vm b/src/main/java/com/google/devtools/build/docgen/templates/be/functions.vm
index d702b0ed1b..11a239644f 100644
--- a/src/main/java/com/google/devtools/build/docgen/templates/be/functions.vm
+++ b/src/main/java/com/google/devtools/build/docgen/templates/be/functions.vm
@@ -642,12 +642,12 @@ sh_binary(
<ul>
<li>Exactly one condition is selected on any invocation.
</li>
- <li>If two conditions match and one is a specialization of the other
- (i.e. it matches on the same flags as the other plus additional ones),
- the specialization takes precedence.
+ <li>If multiple conditions match and one is a specialization of the others
+ (i.e. it matches on the same flags as any of the others plus additional
+ ones), the specialization takes precedence.
</li>
- <li>If two conditions match and neither is a specialization of the other,
- Bazel fails with an error.
+ <li>If multiple conditions match and one is not a specialization of all the
+ others, Bazel fails with an error.
</li>
<li>The special pseudo-label <code>//conditions:default</code> is
considered to match if no other condition matches. If this condition