aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--site/docs/skylark/cookbook.md2
-rw-r--r--site/docs/skylark/rules.md4
-rw-r--r--src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java4
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java4
4 files changed, 7 insertions, 7 deletions
diff --git a/site/docs/skylark/cookbook.md b/site/docs/skylark/cookbook.md
index 7fd742688e..11cae9a9fa 100644
--- a/site/docs/skylark/cookbook.md
+++ b/site/docs/skylark/cookbook.md
@@ -5,7 +5,7 @@ title: Extensions examples
# Extensions examples
-**Tip:** For further examples, see the [GitHub repository](https://github.com/bazelbuild/examples/tree/master/rules/custom_outputs).
+**Tip:** For further examples, see the [GitHub repository](https://github.com/bazelbuild/examples/tree/master/rules).
<!-- [TOC] -->
diff --git a/site/docs/skylark/rules.md b/site/docs/skylark/rules.md
index 0f8772bf86..ed25ec9136 100644
--- a/site/docs/skylark/rules.md
+++ b/site/docs/skylark/rules.md
@@ -235,7 +235,7 @@ output*. There are multiple ways for a rule to introduce a predeclared output:
See [Executable rules](#executable-rules-and-test-rules) below.
All predeclared outputs can be accessed within the rule's implementation
-function under the [`ctx.outputs`](lib/ctx.html#output) struct; see that page
+function under the [`ctx.outputs`](lib/ctx.html#outputs) struct; see that page
for details and restrictions. Non-predeclared outputs are created during
analysis using the [`ctx.actions.declare_file`](lib/actions.html#declare_file)
and [`ctx.actions.declare_directory`](lib/actions.html#declare_directory)
@@ -666,7 +666,7 @@ specify one using `DefaultInfo`; it must not be used otherwise. This output
mechanism is deprecated because it does not support customizing the executable
file's name at analysis time.
-See examples of an [executable rule](https://github.com/bazelbuild/examples/blob/master/rules/executable/executable.bzl)
+See examples of an [executable rule](https://github.com/bazelbuild/examples/blob/master/rules/executable/fortune.bzl)
and a [test rule](https://github.com/bazelbuild/examples/blob/master/rules/test_rule/line_length.bzl).
Test rules inherit the following attributes: `args`, `flaky`, `local`,
diff --git a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
index dcc5080ca6..c053036424 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
@@ -66,8 +66,8 @@ import javax.annotation.concurrent.GuardedBy;
"An action created during rule analysis."
+ "<p>This object is visible for the purpose of testing, and may be obtained from an "
+ "<a href=\"globals.html#Actions\">Actions</a> provider. It is normally not necessary "
- + "to access `Action` objects or their fields within a rule's implementation function. "
- + "You may instead want to see the "
+ + "to access <code>Action</code> objects or their fields within a rule's implementation "
+ + "function. You may instead want to see the "
+ "<a href='../rules.$DOC_EXT#actions'>Rules page</a> for a general discussion of how to "
+ "use actions when defining custom rules, or the <a href='actions.html'>API reference"
+ "</a> for creating actions."
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
index 3c5210b140..c689435365 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
@@ -237,7 +237,7 @@ public class SkylarkRuleClassFunctions {
+ "<a href='File.html'><code>File</code></a> object representing the file that should "
+ "be executed to run the target. By default it is the predeclared output "
+ "<code>ctx.outputs.executable</code>."
- + "<li><code>files</code>: A <a href='depset.html'><code>depset<code></a> of "
+ + "<li><code>files</code>: A <a href='depset.html'><code>depset</code></a> of "
+ "<a href='File.html'><code>File</code></a> objects representing the default outputs "
+ "to build when this target is specified on the blaze command line. By default it is "
+ "all predeclared outputs."
@@ -414,7 +414,7 @@ public class SkylarkRuleClassFunctions {
doc =
"A schema for defining predeclared outputs. Unlike <a href='attr.html#output'><code>"
+ "output</code></a> and <a href='attr.html#output_list'><code>output_list</code>"
- + "</a>attributes, the user does not specify the labels for these files. See the "
+ + "</a> attributes, the user does not specify the labels for these files. See the "
+ "<a href='../rules.$DOC_EXT#files'>Rules page</a> for more on predeclared "
+ "outputs."
+ "<p>The value of this argument is either a dictionary or a callback function "