Merge "Document list of configuration items for include/exclude" into feature/zuulv3
diff --git a/doc/source/admin/tenants.rst b/doc/source/admin/tenants.rst
index a1709a6..54bc10a 100644
--- a/doc/source/admin/tenants.rst
+++ b/doc/source/admin/tenants.rst
@@ -113,16 +113,26 @@
.. attr:: include
- Normally Zuul will load all of the configuration classes
+ Normally Zuul will load all of the :ref:`configuration-items`
appropriate for the type of project (config or untrusted)
in question. However, if you only want to load some
items, the **include** attribute can be used to specify
- that *only* the specified classes should be loaded.
+ that *only* the specified items should be loaded.
Supplied as a string, or a list of strings.
+ The following **configuration items** are recognized:
+
+ * pipeline
+ * job
+ * semaphore
+ * project
+ * project-template
+ * nodeset
+ * secret
+
.. attr:: exclude
- A list of configuration classes that should not be loaded.
+ A list of **configuration items** that should not be loaded.
.. attr:: shadow
diff --git a/doc/source/user/config.rst b/doc/source/user/config.rst
index e356d44..cad2167 100644
--- a/doc/source/user/config.rst
+++ b/doc/source/user/config.rst
@@ -57,6 +57,8 @@
any Zuul-managed repository, the new configuration takes effect
immediately.
+.. _configuration-items:
+
Configuration Items
-------------------