diff --git a/doc/source/admin/drivers/gerrit.rst b/doc/source/admin/drivers/gerrit.rst
index 6467bd5..48f8a33 100644
--- a/doc/source/admin/drivers/gerrit.rst
+++ b/doc/source/admin/drivers/gerrit.rst
@@ -145,9 +145,9 @@
   This may be used for any event.  It requires that a certain kind of
   approval be present for the current patchset of the change (the
   approval could be added by the event in question).  It follows the
-  same syntax as the :ref:`"approval" pipeline requirement
-  <gerrit-pipeline-require-approval>`. For each specified criteria
-  there must exist a matching approval.
+  same syntax as :attr:`pipeline.require.<gerrit
+  source>.approval`. For each specified criteria there must exist a
+  matching approval.
 
 **reject-approval**
   This takes a list of approvals in the same format as
@@ -197,8 +197,6 @@
    The dictionary passed to the Gerrit pipeline `require` attribute
    supports the following attributes:
 
-   .. _gerrit-pipeline-require-approval:
-
    .. attr:: approval
 
       This requires that a certain kind of approval be present for the
@@ -260,8 +258,8 @@
 
       This takes a list of approvals. If an approval matches the
       provided criteria the change can not be entered into the
-      pipeline. It follows the same syntax as the :ref:`approval
-      pipeline requirement above <gerrit-pipeline-require-approval>`.
+      pipeline. It follows the same syntax as
+      :attr:`pipeline.require.<gerrit source>.approval`.
 
       Example to reject a change with any negative vote::
 
diff --git a/doc/source/admin/drivers/github.rst b/doc/source/admin/drivers/github.rst
index 29152ab..298e6b4 100644
--- a/doc/source/admin/drivers/github.rst
+++ b/doc/source/admin/drivers/github.rst
@@ -221,8 +221,6 @@
    The dictionary passed to the GitHub pipeline `require` attribute
    supports the following attributes:
 
-   .. _github-pipeline-require-review:
-
    .. attr:: review
 
       This requires that a certain kind of code review be present for
@@ -300,5 +298,5 @@
 
       This takes a list of code reviews.  If a code review matches the
       provided criteria the pull request can not be entered into the
-      pipeline.  It follows the same syntax as the :ref:`review
-      pipeline requirement above <github-pipeline-require-review>`.
+      pipeline.  It follows the same syntax as
+      :attr:`pipeline.require.<github source>.review`
diff --git a/doc/source/user/config.rst b/doc/source/user/config.rst
index 7aa1a84..5ca8677 100644
--- a/doc/source/user/config.rst
+++ b/doc/source/user/config.rst
@@ -138,8 +138,6 @@
 
       There are currently two schemes for managing pipelines:
 
-      .. _independent_pipeline_manager:
-
       .. zuul:value:: independent
 
          Every event in this pipeline should be treated as independent
@@ -158,8 +156,6 @@
          pipeline. In that case, the changes have already merged, so
          the results can not affect any other events in the pipeline.
 
-      .. _dependent_pipeline_manager:
-
       .. zuul:value:: dependent
 
          The dependent pipeline manager is designed for gating.  It
diff --git a/doc/source/user/gating.rst b/doc/source/user/gating.rst
index 3398892..c1d04a7 100644
--- a/doc/source/user/gating.rst
+++ b/doc/source/user/gating.rst
@@ -41,7 +41,7 @@
 developers to create changes at a rate faster than they can be tested
 and merged.
 
-Zuul's :ref:`dependent pipeline manager<dependent_pipeline_manager>`
+Zuul's :value:`dependent pipeline manager<pipeline.manager.dependent>`
 allows for parallel execution of test jobs for gating while ensuring
 changes are tested correctly, exactly as if they had been tested one
 at a time.  It does this by performing speculative execution of test