Remove unused ${ATTRIBUTE_DEFINITION} and ${ATTRIBUTE_SIGNATURE} variables from

Bazel native rule inline documentation.

These variables are no longer used because the docgen templates now directly generate the table of attributes instead of using ATTRIBUTE_DEFINITION and call RuleDocumentation.getAttributeSignature() instead of using ATTRIBUTE_SIGNATURE. RuleDocumentation.getHtmlDocumentation() currently resolves both of these variables to the empty string.

--
MOS_MIGRATED_REVID=112933659

54 files changed, 0 insertions, 224 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigRuleClasses.java
index fb096edfd0..cc01371ccf 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigRuleClasses.java
@@ -206,16 +206,12 @@ public class ConfigRuleClasses {
 
 /*<!-- #BLAZE_RULE (NAME = config_setting, TYPE = OTHER, FAMILY = General)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
   Matches an expected configuration state (expressed as Blaze flags) for the purpose of triggering
   configurable attributes. See <a href="functions.html#select">select</a> for how to consume this
   rule and <a href="common-definitions.html#configurable-attributes">
   Configurable attributes</a> for an overview of the general feature.
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="config_setting_examples">Examples</h4>
 
 <p>The following matches any Blaze invocation that specifies <code>--compilation_mode=opt</code>
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java
index 8c925d0f3e..0b9720e0a6 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java
@@ -100,16 +100,12 @@ public class BazelAndroidBinaryRule implements RuleDefinition {
 }
 /*<!-- #BLAZE_RULE (NAME = android_binary, TYPE = BINARY, FAMILY = Android) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
   Produces Android application package files (.apk).
 </p>
 
 ${IMPLICIT_OUTPUTS}
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="android_binary_examples">Examples</h4>
 <p>Examples of Android rules can be found in the <code>examples/android</code> directory of the
 Bazel source tree.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java
index 040fe3114d..640f908570 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java
@@ -62,8 +62,6 @@ public class BazelAndroidLibraryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = android_library, TYPE = LIBRARY, FAMILY = Android) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule compiles and archives its sources into a <code>.jar</code> file.
   The Android runtime library <code>android.jar</code> is implicitly put on
   the compilation class path.
@@ -75,8 +73,6 @@ in the <code>deps</code> attribute.
 </p>
 ${IMPLICIT_OUTPUTS}
 
-${ATTRIBUTE_DEFINITION}
-
 
 <h4 id="android_library_examples">Examples</h4>
 <p>Examples of Android rules can be found in the <code>examples/android</code> directory of the
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelActionListenerRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelActionListenerRule.java
index 20baef158a..2b198f5385 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelActionListenerRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelActionListenerRule.java
@@ -74,8 +74,6 @@ public final class BazelActionListenerRule implements RuleDefinition {
   implementing an <code>action_listener</code>/<code>extra_action</code>.
 </p>
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
   An <code>action_listener</code> rule doesn't produce any output itself.
   Instead, it allows tool developers to insert
@@ -95,8 +93,6 @@ ${ATTRIBUTE_SIGNATURE}
   <a href="#extra_action"><code>extra_action</code></a>s into the build graph.
 </p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="action_listener_example">Example</h4>
 <pre>
 action_listener(
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelExtraActionRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelExtraActionRule.java
index ca40005c61..d4fc70b149 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelExtraActionRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelExtraActionRule.java
@@ -133,8 +133,6 @@ public final class BazelExtraActionRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = extra_action, TYPE = LIBRARY, FAMILY = Extra Actions)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
   An <code>extra_action</code> rule doesn't produce any meaningful output
   when specified as a regular build target. Instead, it allows tool developers
@@ -153,6 +151,4 @@ ${ATTRIBUTE_SIGNATURE}
   It also has access to all the input files the original action has access to.
 </p>
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelFilegroupRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelFilegroupRule.java
index 8685da7548..d5d26dfa0d 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelFilegroupRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelFilegroupRule.java
@@ -86,8 +86,6 @@ public final class BazelFilegroupRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = filegroup, TYPE = BINARY, FAMILY = General)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
   Use <code>filegroup</code> to give a convenient name to a collection of targets.
   These can then be referenced from other rules.
@@ -101,8 +99,6 @@ ${ATTRIBUTE_SIGNATURE}
   explicitly known to the build system.
 </p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="filegroup_example">Examples</h4>
 
 <p>
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelTestSuiteRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelTestSuiteRule.java
index acfcf17d76..57fe10b6ae 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelTestSuiteRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelTestSuiteRule.java
@@ -112,16 +112,12 @@ public final class BazelTestSuiteRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = test_suite, TYPE = TEST, FAMILY = General)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
 A <code>test_suite</code> defines a set of tests that are considered "useful" to humans.  This
 allows projects to define sets of tests, such as "tests you must run before checkin", "our
 project's stress tests" or "all small tests."
 </p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="test_suite_examples">Examples</h4>
 
 <p>A test suite to run all of the small tests in the current package.</p>
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
index dbb1b75f86..68bc7b1413 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
@@ -802,21 +802,13 @@ public class BazelCppRuleClasses {
 
 /*<!-- #BLAZE_RULE (NAME = cc_binary, TYPE = BINARY, FAMILY = C / C++) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 ${IMPLICIT_OUTPUTS}
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
 
 
 /*<!-- #BLAZE_RULE (NAME = cc_library, TYPE = LIBRARY, FAMILY = C / C++) -->
 
-${ATTRIBUTE_SIGNATURE}
-
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="hdrs">Header inclusion checking</h4>
 
 <p>
@@ -928,8 +920,4 @@ cc_library(
 
 /*<!-- #BLAZE_RULE (NAME = cc_test, TYPE = TEST, FAMILY = C / C++) -->
 
-${ATTRIBUTE_SIGNATURE}
-
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java
index e153e13e5e..56344d6f2f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java
@@ -226,8 +226,6 @@ public final class BazelGenRuleRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = genrule, TYPE = OTHER, FAMILY = General)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>A <code>genrule</code> generates one or more files using a user-defined Bash command.</p>
 
 <p>
@@ -338,8 +336,6 @@ ${ATTRIBUTE_SIGNATURE}
     produces many outputs.</li>
 </ul>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="genrule_examples">Examples</h4>
 
 <p>
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaBinaryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaBinaryRule.java
index f14acfd476..4f01307216 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaBinaryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaBinaryRule.java
@@ -92,8 +92,6 @@ public final class BazelJavaBinaryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = java_binary, TYPE = BINARY, FAMILY = Java) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
   Builds a Java archive ("jar file"), plus a wrapper shell script with the same name as the rule.
   The wrapper shell script uses a classpath that includes, among other things, a jar file for each
@@ -139,6 +137,4 @@ java_binary(
 )
 </pre>
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaImportRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaImportRule.java
index e2c596fd5a..11359005e8 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaImportRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaImportRule.java
@@ -83,15 +83,11 @@ public final class BazelJavaImportRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = java_import, TYPE = LIBRARY, FAMILY = Java) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
   This rule allows the use of precompiled JAR files as libraries for
   <code><a href="#java_library">java_library</a></code> rules.
 </p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="java_import_examples">Examples</h4>
 
 <pre class="code">
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java
index 2087920073..91ec90d5b1 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java
@@ -171,12 +171,8 @@ public final class BazelJavaLibraryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = java_library, TYPE = LIBRARY, FAMILY = Java) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule compiles and links sources into a <code>.jar</code> file.</p>
 
 ${IMPLICIT_OUTPUTS}
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaPluginRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaPluginRule.java
index 2968403880..a02b578ef1 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaPluginRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaPluginRule.java
@@ -67,8 +67,6 @@ public final class BazelJavaPluginRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = java_plugin, TYPE = OTHER, FAMILY = Java) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
   <code>java_plugin</code> defines plugins for the Java compiler run by Bazel. At the moment, the
   only supported kind of plugins are annotation processors. A <code>java_library</code> or
@@ -80,8 +78,6 @@ ${ATTRIBUTE_SIGNATURE}
 
 ${IMPLICIT_OUTPUTS}
 
-${ATTRIBUTE_DEFINITION}
-
 <p>
   Arguments are identical to <a href="#java_library"><code>java_library</code></a>, except for the
   addition of the <code>processor_class</code> argument.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
index 82c0012a60..01de2aef95 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
@@ -112,8 +112,6 @@ public final class BazelJavaTestRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = java_test, TYPE = TEST, FAMILY = Java) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
 A <code>java_test()</code> rule compiles a Java test. A test is a binary wrapper around your
 test code. The test runner's main method is invoked instead of the main class being compiled.
@@ -121,8 +119,6 @@ test code. The test runner's main method is invoked instead of the main class be
 
 ${IMPLICIT_OUTPUTS}
 
-${ATTRIBUTE_DEFINITION}
-
 <p>
 See the section on <a href="#java_binary_args">java_binary()</a> arguments. This rule also
 supports all <a href="common-definitions.html#common-attributes-tests">attributes common
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyBinaryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyBinaryRule.java
index 043e7ef40e..021c576c70 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyBinaryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyBinaryRule.java
@@ -50,8 +50,6 @@ public final class BazelPyBinaryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = py_binary, TYPE = BINARY, FAMILY = Python) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
   A <code>py_binary</code> is an executable Python program consisting
   of a collection of <code>.py</code> source files (possibly belonging
@@ -61,8 +59,6 @@ ${ATTRIBUTE_SIGNATURE}
   the correct initial environment and data.
 </p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="py_binary_examples">Examples</h4>
 
 <pre class="code">
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyLibraryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyLibraryRule.java
index ff51bd5c80..f10e472e2c 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyLibraryRule.java
@@ -73,8 +73,4 @@ public final class BazelPyLibraryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = py_library, TYPE = LIBRARY, FAMILY = Python) -->
 
-${ATTRIBUTE_SIGNATURE}
-
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyTestRule.java
index bf1d0415f0..5e651a1da4 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyTestRule.java
@@ -59,14 +59,10 @@ public final class BazelPyTestRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = py_test, TYPE = TEST, FAMILY = Python) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
 A <code>py_test()</code> rule compiles a test.  A test is a binary wrapper
  around some test code.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="py_test_examples">Examples</h4>
 
 <p>
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShBinaryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShBinaryRule.java
index 59d809624a..7f9ca97ccd 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShBinaryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShBinaryRule.java
@@ -49,10 +49,6 @@ public final class BazelShBinaryRule implements RuleDefinition {
   the extension (e.g. <code>.sh</code>); do not give the rule and the file the same name.
 </p>
 
-${ATTRIBUTE_SIGNATURE}
-
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="sh_binary_examples">Example</h4>
 
 <p>For a simple shell script with no dependencies or data:
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShLibraryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShLibraryRule.java
index 879f0dfa97..f108953134 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShLibraryRule.java
@@ -54,8 +54,6 @@ public final class BazelShLibraryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = sh_library, TYPE = LIBRARY, FAMILY = Shell) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
   The main use for this rule is to aggregate together a logical
   "library" consisting of related scripts&mdash;programs in an
@@ -82,8 +80,6 @@ ${ATTRIBUTE_SIGNATURE}
   It is however good practice to use the attributes for their usual purpose (as with other rules).
 </p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="sh_library_examples">Examples</h4>
 
 <pre class="code">
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShTestRule.java
index 48892211d5..51db3b4dda 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShTestRule.java
@@ -43,12 +43,8 @@ public final class BazelShTestRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = sh_test, TYPE = TEST, FAMILY = Shell) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>A <code>sh_test()</code> rule creates a test written as a Bourne shell script.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <p>See the <a href="common-definitions.html#common-attributes-tests">
 attributes common to all test rules (*_test)</a>.</p>
 
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/GitRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/GitRepositoryRule.java
index 48d4c63b14..d0e4371b1e 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/GitRepositoryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/GitRepositoryRule.java
@@ -78,13 +78,9 @@ public class GitRepositoryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = git_repository, TYPE = OTHER, FAMILY = Workspace)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>Clones a Git repository, checks out the specified tag, or commit, and makes its targets
 available for binding.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="git_repository_examples">Examples</h4>
 
 <p>Suppose the current repository contains the source code for a chat program, rooted at the
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpArchiveRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpArchiveRule.java
index 3152e2cc35..ea28220db3 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpArchiveRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpArchiveRule.java
@@ -98,8 +98,6 @@ public class HttpArchiveRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = http_archive, TYPE = OTHER, FAMILY = Workspace)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>Downloads a Bazel repository as a compressed archive file,
   decompresses it, and makes its targets available for binding. The
   repository should already contain a BUILD file. If it does not, use
@@ -108,8 +106,6 @@ ${ATTRIBUTE_SIGNATURE}
 <p>It supports Zip-formatted archives (with the .zip extension) and
 tarballs (.tar.gz and .tgz extensions).</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="http_archive_examples">Examples</h4>
 
 <p>Suppose the current repository contains the source code for a chat program, rooted at the
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpFileRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpFileRule.java
index ea513dab3f..f64429f264 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpFileRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpFileRule.java
@@ -73,12 +73,8 @@ public class HttpFileRule implements RuleDefinition {
 }
 /*<!-- #BLAZE_RULE (NAME = http_file, TYPE = OTHER, FAMILY = Workspace)[GENERIC_RULE] -->
 
- ${ATTRIBUTE_SIGNATURE}
-
  <p>Downloads a file from a URL and makes it available to be used as a file group.</p>
 
- ${ATTRIBUTE_DEFINITION}
-
  <h4 id="http_file_examples">Examples</h4>
 
  <p>Suppose you need to have a debian package for your custom rules. This package is available from
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpJarRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpJarRule.java
index 1cadc6bdd9..e072848f02 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpJarRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/HttpJarRule.java
@@ -65,14 +65,10 @@ public class HttpJarRule implements RuleDefinition {
 }
 /*<!-- #BLAZE_RULE (NAME = http_jar, TYPE = OTHER, FAMILY = Workspace)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>Downloads a jar from a URL and makes it available to be used as a Java dependency.</p>
 
 <p>Downloaded files must have a .jar extension.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="http_jar_examples">Examples</h4>
 
 <p>Suppose the current repository contains the source code for a chat program, rooted at the
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenJarRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenJarRule.java
index 01f9a9e570..70cfa33e0b 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenJarRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenJarRule.java
@@ -84,12 +84,8 @@ public class MavenJarRule implements RuleDefinition {
 }
 /*<!-- #BLAZE_RULE (NAME = maven_jar, TYPE = OTHER, FAMILY = Workspace)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>Downloads a jar from Maven and makes it available to be used as a Java dependency.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="maven_jar_examples">Examples</h4>
 
 Suppose that the current repostory contains a java_library target that needs to depend on Guava.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenServerRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenServerRule.java
index 021c8d3d60..ee3352bc91 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenServerRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenServerRule.java
@@ -66,12 +66,8 @@ public class MavenServerRule implements RuleDefinition {
 }
 /*<!-- #BLAZE_RULE (NAME = maven_server, TYPE = OTHER, FAMILY = Workspace)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>How to access a Maven repository.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <p>This is a combination of a &lt;repository&gt; definition from a pom.xml file and a
 &lt;server&lt; definition from a settings.xml file.</p>
 
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/NewGitRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/NewGitRepositoryRule.java
index a3615f3f15..675091d5ae 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/NewGitRepositoryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/NewGitRepositoryRule.java
@@ -87,13 +87,9 @@ public class NewGitRepositoryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = new_git_repository, TYPE = OTHER, FAMILY = Workspace)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>Clones a Git repository, checks out the specified tag, or commit, and makes its targets
 available for binding.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="git_repository_examples">Examples</h4>
 
 <p>Suppose the current repository contains the source code for a chat program, rooted at the
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/NewHttpArchiveRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/NewHttpArchiveRule.java
index f3211c24af..dd3003cb3d 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/NewHttpArchiveRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/NewHttpArchiveRule.java
@@ -103,16 +103,12 @@ public class NewHttpArchiveRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = new_http_archive, TYPE = OTHER, FAMILY = Workspace)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>Downloads a compressed archive file, decompresses it, and creates a Bazel repository by
 combining the archive with the provided BUILD file.</p>
 
 <p>It supports Zip-formatted archives (with the .zip extension) and
 tarballs (.tar.gz and .tgz extensions).</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="new_http_archive_examples">Examples</h4>
 
 <p>Suppose the current repository contains the source code for a chat program, rooted at the
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java
index 328c9e8a52..3036d9fe81 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigRule.java
@@ -82,12 +82,8 @@ public class XcodeConfigRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = xcode_config, TYPE = OTHER, FAMILY = Workspace)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>A single target of this rule can be referenced by the <code>--xcode_config</code> build flag to
 translate the <code>--xcode_version</code> flag into an accepted official xcode version. This
 allows selection of a an official xcode version from a number of registered aliases.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java
index 7a896ba758..7a9a23361a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionRule.java
@@ -64,11 +64,7 @@ public class XcodeVersionRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = xcode_version, TYPE = OTHER, FAMILY = Workspace)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>Represents a single official xcode version with acceptable aliases for that xcode version.
 See the <code>xcode_config</code> rule.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQueryRule.java b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQueryRule.java
index 9ea2116960..56c608fa1e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQueryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQueryRule.java
@@ -75,8 +75,6 @@ public final class GenQueryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = genquery, TYPE = LIBRARY, FAMILY = General)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
   <p>
   <code>genquery()</code> runs a query specified in the
     <a href="../blaze-query-v2.html">Blaze query language</a> and dumps the result
@@ -101,8 +99,6 @@ ${ATTRIBUTE_SIGNATURE}
     The name of the output file is the name of the rule.
   </p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="genquery_examples">Examples</h4>
   <p>
     This example writes the list of the labels in the transitive closure of the
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImportBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImportBaseRule.java
index eae756a8f7..a3b306bb6c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImportBaseRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImportBaseRule.java
@@ -90,11 +90,7 @@ public class JavaImportBaseRule implements RuleDefinition {
 }
 /*<!-- #BLAZE_RULE (NAME = java_import, TYPE = LIBRARY, FAMILY = Java) -->
 
-${ATTRIBUTE_SIGNATURE}
-
   <p>This rule allows the use of precompiled JAR files as libraries for
   <code><a href="#java_library">java_library</a></code> rules.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java
index 4f33d92d71..b79cfab469 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java
@@ -74,16 +74,12 @@ public final class JavaToolchainRule implements RuleDefinition {
 }
 /*<!-- #BLAZE_RULE (NAME = java_toolchain, TYPE = OTHER, FAMILY = Java) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>
 Specifies the configuration for the Java compiler. Which toolchain to be used can be changed through
 the --java_toolchain argument. Normally you should not write those kind of rules unless you want to
 tune your Java compiler.
 </p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="java_binary_examples">Examples</h4>
 
 <p>A simple example would be:
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosApplicationRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosApplicationRule.java
index bf2b066692..bead926ac6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosApplicationRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosApplicationRule.java
@@ -87,8 +87,6 @@ public class IosApplicationRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = ios_application, TYPE = BINARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule produces an application bundle for iOS.</p>
 <p>When running an iOS application using the <code>run</code> command, environment variables that
 are prefixed with <code>IOS_</code> will be passed to the launched application, with the prefix
@@ -97,6 +95,4 @@ passed to the application.</p>
 
 ${IMPLICIT_OUTPUTS}
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosDeviceRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosDeviceRule.java
index 32dd9c8d4a..2e73cf139e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosDeviceRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosDeviceRule.java
@@ -62,11 +62,7 @@ public final class IosDeviceRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = ios_device, TYPE = BINARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule defines an iOS device profile that defines a simulator against
 which to run tests.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosExtensionBinaryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosExtensionBinaryRule.java
index b005527c99..6879e36f68 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosExtensionBinaryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosExtensionBinaryRule.java
@@ -54,13 +54,9 @@ public class IosExtensionBinaryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = ios_extension_binary, TYPE = BINARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule produces a binary for an iOS app extension by linking one or more
 Objective-C libraries.</p>
 
 ${IMPLICIT_OUTPUTS}
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosExtensionRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosExtensionRule.java
index 1d31757529..fbf6b523ff 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosExtensionRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosExtensionRule.java
@@ -69,8 +69,6 @@ public class IosExtensionRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = ios_extension, TYPE = BINARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule produces a bundled binary for an iOS app extension from a compiled binary and bundle
 metadata.</p>
 
@@ -103,6 +101,4 @@ between how each thing is processed:
 
 ${IMPLICIT_OUTPUTS}
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkBinaryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkBinaryRule.java
index 2402eea28f..3ee1bc7c50 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkBinaryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkBinaryRule.java
@@ -57,13 +57,9 @@ public class IosFrameworkBinaryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = ios_framework_binary, TYPE = BINARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule produces a dynamic library for a framework by linking one or more Objective-C
 libraries.</p>
 
 ${IMPLICIT_OUTPUTS}
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
\ No newline at end of file
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkRule.java
index 9a32299db2..17dfddee1c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosFrameworkRule.java
@@ -71,8 +71,6 @@ public class IosFrameworkRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = ios_framework, TYPE = BINARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule produces a bundled binary for a framework from a compiled binary and bundle
 metadata.</p>
 
@@ -83,6 +81,4 @@ final app bundle and only used during compilation stage.
 <p>Bundles generated by this rule use a bundle directory called
 <code>Frameworks/<var>framework_name</var>.framework</code>.
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosTestRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosTestRule.java
index bcf28e1a89..141258a44f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosTestRule.java
@@ -189,12 +189,8 @@ public class IosTestRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = ios_test, TYPE = TEST, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule provides a way to build iOS unit tests written in KIF, GTM and XCTest test frameworks
 on both iOS simulator and real devices.
 </p>
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java
index 3061f9c6f4..677aa37872 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java
@@ -67,8 +67,6 @@ public class J2ObjcLibraryBaseRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = j2objc_library, TYPE = LIBRARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p> This rule uses <a href="https://github.com/google/j2objc">J2ObjC</a> to translate Java source
 files to Objective-C, which then can be used used as dependencies of objc_library and objc_binary
 rules. Detailed information about J2ObjC itself can be found at  <a href="http://j2objc.org">the
@@ -88,6 +86,4 @@ separate common target that can be depended upon.
 </p>
 
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryRule.java
index 6d76874cc1..647af87d8a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryRule.java
@@ -73,8 +73,6 @@ public class ObjcBinaryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = objc_binary, TYPE = BINARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule produces one or more Objective-C libraries for bundling in an
 <code>ios_application</code>.</p>
 
@@ -87,6 +85,4 @@ source file to be defined in either <code>srcs</code> or <code>non_arc_srcs</cod
 
 ${IMPLICIT_OUTPUTS}
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleLibraryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleLibraryRule.java
index 30da08fc4d..a7eaa6f161 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleLibraryRule.java
@@ -52,12 +52,8 @@ public class ObjcBundleLibraryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = objc_bundle_library, TYPE = LIBRARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule encapsulates a library which is provided to dependers as a bundle.
 A <code>objc_bundle_library</code>'s resources are put in a nested bundle in
 the final iOS application.
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleRule.java
index 30a675c68c..451f9f7451 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleRule.java
@@ -54,11 +54,7 @@ public class ObjcBundleRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = objc_bundle, TYPE = LIBRARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule encapsulates an already-built bundle. It is defined by a list of
 files in one or more <code>.bundle</code> directories.
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcFrameworkRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcFrameworkRule.java
index 6094b42bff..80b63a07ac 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcFrameworkRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcFrameworkRule.java
@@ -56,11 +56,7 @@ public class ObjcFrameworkRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = objc_framework, TYPE = LIBRARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule encapsulates an already-built framework. It is defined by a list
 of files in one or more <code>.framework</code> directories.
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcImportRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcImportRule.java
index 845b9e2ec1..f59bbe3a22 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcImportRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcImportRule.java
@@ -66,12 +66,8 @@ public class ObjcImportRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = objc_import, TYPE = LIBRARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule encapsulates an already-compiled static library in the form of an
 <code>.a</code> file. It also allows exporting headers and resources using the same
 attributes supported by <code>objc_library</code>.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryRule.java
index cda61a78f5..fa1be6ed59 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryRule.java
@@ -57,12 +57,8 @@ public class ObjcLibraryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = objc_library, TYPE = LIBRARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule produces a static library from the given Objective-C source files.</p>
 
 ${IMPLICIT_OUTPUTS}
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcOptionsRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcOptionsRule.java
index 9557f22ec6..f48fc4d39e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcOptionsRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcOptionsRule.java
@@ -61,11 +61,7 @@ public class ObjcOptionsRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = objc_options, TYPE = OTHER, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule provides a nameable set of build settings to use when building
 Objective-C targets.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java
index 36774aec72..24ba5a4beb 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java
@@ -114,11 +114,7 @@ public class ObjcProtoLibraryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = objc_proto_library, TYPE = LIBRARY, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule produces a static library from the given proto_library dependencies, after applying an
 options file.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeprojRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeprojRule.java
index 9bfa81e276..56c6083bf3 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeprojRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcXcodeprojRule.java
@@ -77,11 +77,7 @@ public class ObjcXcodeprojRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = objc_xcodeproj, TYPE = OTHER, FAMILY = Objective-C) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>This rule combines build information about several objc targets (and all their transitive
 dependencies) into a single Xcode project file, for use in developing on a Mac.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryRule.java b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryRule.java
index cb92ea82ab..f591296277 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryRule.java
@@ -75,13 +75,9 @@ public final class BazelProtoLibraryRule implements RuleDefinition {
 
 /*<!-- #BLAZE_RULE (NAME = proto_library, TYPE = LIBRARY, FAMILY = Protocol Buffer) -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>Use <code>proto_library</code> to define libraries of protocol buffers
    which may be used from multiple languages. A <code>proto_library</code> may be listed
    in the <code>deps</code> clause of supported rules, such as <code>objc_proto_library</code>.
 </p>
 
-${ATTRIBUTE_DEFINITION}
-
 <!-- #END_BLAZE_RULE -->*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/BindRule.java b/src/main/java/com/google/devtools/build/lib/rules/repository/BindRule.java
index ff47bc06f7..2c01fafc2f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/BindRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/BindRule.java
@@ -61,12 +61,8 @@ public final class BindRule implements RuleDefinition {
 }
 /*<!-- #BLAZE_RULE (NAME = bind, TYPE = OTHER, FAMILY = Workspace)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>Gives a target an alias in the <code>//external</code> package.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <p>The <code>//external</code> package is not a "normal" package: there is no external/ directory,
   so it can be thought of as a "virtual package" that contains all bound targets.</p>
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryRule.java
index fcfb9b0a55..fbeb36f179 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/LocalRepositoryRule.java
@@ -57,14 +57,10 @@ public class LocalRepositoryRule implements RuleDefinition {
 }
 /*<!-- #BLAZE_RULE (NAME = local_repository, TYPE = OTHER, FAMILY = Workspace)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>Allows targets from a local directory to be bound. This means that the current repository can
   use targets defined in this other directory. See the <a href="#bind_examples">bind section</a>
   for more details.</p>
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="local_repository_examples">Examples</h4>
 
 <p>Suppose the current repository is a chat client, rooted at the directory <i>~/chat-app</i>. It
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/NewLocalRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/rules/repository/NewLocalRepositoryRule.java
index f2a83b846e..8dfa9fa214 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/NewLocalRepositoryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/NewLocalRepositoryRule.java
@@ -64,8 +64,6 @@ public class NewLocalRepositoryRule implements RuleDefinition {
 }
 /*<!-- #BLAZE_RULE (NAME = new_local_repository, TYPE = OTHER, FAMILY = Workspace)[GENERIC_RULE] -->
 
-${ATTRIBUTE_SIGNATURE}
-
 <p>Allows a local directory to be turned into a Bazel repository. This means that the current
   repository can define and use targets from anywhere on the filesystem.</p>
 
@@ -73,8 +71,6 @@ ${ATTRIBUTE_SIGNATURE}
 symlinks to the BUILD file and path given.  The build file should create targets relative to the
 <code>path</code>.
 
-${ATTRIBUTE_DEFINITION}
-
 <h4 id="new_local_repository_examples">Examples</h4>
 
 <p>Suppose the current repository is a chat client, rooted at the directory <i>~/chat-app</i>. It